[TASK] Refactor lang engine

[jirafeau_project.git] / install.php

diff --git a/install.php b/install.php
index fbd366727c896f8b37453ddd3c4e56281354f10e..8c0f686745fccf108b56f1dab831fcb9195f46dc 100644 (file)
--- a/install.php
+++ b/install.php
@@ -17,30 +17,28 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

-define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');

 
 

-define ('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
-define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
+define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
+define('JIRAFEAU_VAR_RAND_LENGTH', 15);

 
 

-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');

 
 /**
  * Prepend used functions
  **/
 
 
 /**
  * Prepend used functions
  **/
 

-function
-jirafeau_quoted ($str)
+function jirafeau_quoted($str)

 {
 {

-    return QUOTE . str_replace (QUOTE, "\'", $str) . QUOTE;
+    return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;

 }
 
 }
 

-function
-jirafeau_export_cfg ($cfg)
+function jirafeau_export_cfg($cfg)

 {
     $content = '<?php' . NL;
 {
     $content = '<?php' . NL;

-    $content .= '/* ' . t ('This file was generated by the install process. ' .
+    $content .= '/* ' . t('This file was generated by the install process. ' .

                'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL;
     $content .= '$cfg = ' . var_export($cfg, true) . ';';
                'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL;
     $content .= '$cfg = ' . var_export($cfg, true) . ';';


@@ -52,10 +50,9 @@ jirafeau_export_cfg ($cfg)
     }
 }
 
     }
 }
 

-function
-jirafeau_mkdir ($path)
+function jirafeau_mkdir($path)

 {
 {

-    return !(!file_exists ($path) && !@mkdir ($path, 0755));
+    return !(!file_exists($path) && !@mkdir($path, 0755));

 }
 
 /**
 }
 
 /**


@@ -64,15 +61,13 @@ jirafeau_mkdir ($path)
  * @param $path is the file or directory to be tested.
  * @return true if $path is writable.
  */
  * @param $path is the file or directory to be tested.
  * @return true if $path is writable.
  */

-function
-jirafeau_is_writable ($path)
+function jirafeau_is_writable($path)

 {
     /* "@" gets rid of error messages. */
 {
     /* "@" gets rid of error messages. */

-    return is_writable ($path) || @chmod ($path, 0777);
+    return is_writable($path) || @chmod($path, 0777);

 }
 
 }
 

-function
-jirafeau_check_var_dir ($path)
+function jirafeau_check_var_dir($path)

 {
     $mkdir_str1 = t('The following directory could not be created') . ':';
     $mkdir_str2 = t('You should create this directory manually.');
 {
     $mkdir_str1 = t('The following directory could not be created') . ':';
     $mkdir_str2 = t('You should create this directory manually.');


@@ -81,38 +76,30 @@ jirafeau_check_var_dir ($path)
                     'this directory.');
     $solution_str = t('Here is a solution') . ':';
 
                     'this directory.');
     $solution_str = t('Here is a solution') . ':';
 

-    if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
-        return array ('has_error' => true,
+    if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
+        return array('has_error' => true,

                       'why' => $mkdir_str1 . '<br /><code>' .
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
                       'why' => $mkdir_str1 . '<br /><code>' .
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);

+    }

 
 

-    foreach (array ('files', 'links', 'async', 'alias') as $subdir)
-    {
+    foreach (array('files', 'links', 'async') as $subdir) {

         $subpath = $path.$subdir;
 
         $subpath = $path.$subdir;
 

-        if (!jirafeau_mkdir ($subpath) || !jirafeau_is_writable ($subpath))
-            return array ('has_error' => true,
+        if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
+            return array('has_error' => true,

                           'why' => $mkdir_str1 . '<br /><code>' .
                                    $subpath . '</code><br />' . $solution_str .
                                    '<br />' . $mkdir_str2);
                           'why' => $mkdir_str1 . '<br /><code>' .
                                    $subpath . '</code><br />' . $solution_str .
                                    '<br />' . $mkdir_str2);

+        }

     }
 
     }
 

-    return array ('has_error' => false, 'why' => '');
-}
-
-function
-jirafeau_add_ending_slash ($path)
-{
-    return $path . ((substr ($path, -1) == '/') ? '' : '/');
+    return array('has_error' => false, 'why' => '');

 }
 
 }
 

-function
-jirafeau_fatal_error($errorText)
+function jirafeau_add_ending_slash($path)

 {
 {

-    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
+    return $path . ((substr($path, -1) == '/') ? '' : '/');

 }
 
 /**
 }
 
 /**


@@ -121,24 +108,21 @@ jirafeau_fatal_error($errorText)
 
 // Is the installation process done already?
 // Then there is nothing to do here → redirect to the main page.
 
 // Is the installation process done already?
 // Then there is nothing to do here → redirect to the main page.

-if ($cfg['installation_done'] === true)
-{
-       header('Location: index.php');
-       exit;
+if ($cfg['installation_done'] === true) {
+    header('Location: index.php');
+    exit;

 }
 
 /**
  * Prepare installation process
  **/
 
 }
 
 /**
  * Prepare installation process
  **/
 

-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+require(JIRAFEAU_ROOT . 'lib/template/header.php');

 
 // does the local configuration file exist?
 
 // does the local configuration file exist?

-if (!file_exists (JIRAFEAU_CFG))
-{
+if (!file_exists(JIRAFEAU_CFG)) {

     // show an error if it is not possible to create the file
     // show an error if it is not possible to create the file

-    if (!@touch (JIRAFEAU_CFG))
-    {
+    if (!@touch(JIRAFEAU_CFG)) {

         jirafeau_fatal_error(
             t('The local configuration file could not be created. Create a ' .
                '<code>lib/config.local.php</code> file and give the write ' .
         jirafeau_fatal_error(
             t('The local configuration file could not be created. Create a ' .
                '<code>lib/config.local.php</code> file and give the write ' .


@@ -150,8 +134,7 @@ if (!file_exists (JIRAFEAU_CFG))
 }
 
 // is the local configuration writable?
 }
 
 // is the local configuration writable?

-if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
-{
+if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {

     jirafeau_fatal_error(
         t('The local configuration is not writable by the web server. ' .
             'Give the write permission to the web server on the ' .
     jirafeau_fatal_error(
         t('The local configuration is not writable by the web server. ' .
             'Give the write permission to the web server on the ' .


@@ -163,48 +146,49 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
  * Run trough each installation step
  **/
 
  * Run trough each installation step
  **/
 

-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
-    switch ($_POST['step'])
-    {
+if (isset($_POST['step']) && isset($_POST['next'])) {
+    switch ($_POST['step']) {

     case 1:
         $cfg['lang'] = $_POST['lang'];
     case 1:
         $cfg['lang'] = $_POST['lang'];

-        jirafeau_export_cfg ($cfg);
+        jirafeau_export_cfg($cfg);

         break;
 
     case 2:
         break;
 
     case 2:

-        $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
-        jirafeau_export_cfg ($cfg);
+        if (strlen($_POST['admin_password'])) {
+            $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+        } else {
+            $cfg['admin_password'] = '';
+        }
+        jirafeau_export_cfg($cfg);

         break;
 
     case 3:
         break;
 
     case 3:

-        $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
-        $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
-        jirafeau_export_cfg ($cfg);
+        $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
+        $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
+        jirafeau_export_cfg($cfg);

         break;
 
     case 4:
         break;
 
     case 4:

-        $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
-        $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
-        jirafeau_export_cfg ($cfg);
+        $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']);
+        $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']);
+        jirafeau_export_cfg($cfg);

         break;
     }
         break;
     }

-

 }
 
 $current = 1;
 }
 
 $current = 1;

-if (isset ($_POST['next']))
+if (isset($_POST['next'])) {

     $current = $_POST['step'] + 1;
     $current = $_POST['step'] + 1;

-else if (isset ($_POST['previous']))
+} elseif (isset($_POST['previous'])) {

     $current = $_POST['step'] - 1;
     $current = $_POST['step'] - 1;

-else if (isset ($_POST['retry']))
+} elseif (isset($_POST['retry'])) {

     $current = $_POST['step'];
     $current = $_POST['step'];

+}

 
 

-switch ($current)
-{
+switch ($current) {

 case 1:
 default:
 case 1:
 default:

-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .

     ' %d ' . t('out of') . ' %d', 1, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
     ' %d ' . t('out of') . ' %d', 1, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -212,16 +196,14 @@ default:
         "step" value = "1" /><fieldset> <legend><?php echo t('Language');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         "step" value = "1" /><fieldset> <legend><?php echo t('Language');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo

-        t
-        ('Jirafeau is internationalised. Choose a specific langage or ' .
+        t('Jirafeau is internationalised. Choose a specific langage or ' .

          'choose Automatic (langage is provided by user\'s browser).');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"
        ><?php echo t('Choose the default language') . ':';
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
          'choose Automatic (langage is provided by user\'s browser).');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"
        ><?php echo t('Choose the default language') . ':';
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">

-        <?php foreach ($languages_list as $key => $item)
-    {
+        <?php foreach ($languages_list as $key => $item) {

         echo '<option value="'.$key.'"'.($key ==
                       $cfg['lang'] ? ' selected="selected"'
                       : '').'>'.$item.'</option>'.NL;
         echo '<option value="'.$key.'"'.($key ==
                       $cfg['lang'] ? ' selected="selected"'
                       : '').'>'.$item.'</option>'.NL;


@@ -237,7 +219,7 @@ default:
 break;
 
 case 2:
 break;
 
 case 2:

-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .

     ' %d ' . t('out of') . ' %d', 2, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
     ' %d ' . t('out of') . ' %d', 2, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -246,8 +228,7 @@ case 2:
         echo t('Administration password');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         echo t('Administration password');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo

-        t
-        ('Jirafeau has an administration interface (through admin.php). ' .
+        t('Jirafeau has an administration interface (through admin.php). ' .

         'You can set a password to access the interface or leave it empty ' .
         'to disable the interface.');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_password"
         'You can set a password to access the interface or leave it empty ' .
         'to disable the interface.');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_password"


@@ -268,7 +249,7 @@ case 2:
 break;
 
 case 3:
 break;
 
 case 3:

-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .

     ' %d ' . t('out of') . ' %d', 3, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
     ' %d ' . t('out of') . ' %d', 3, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -277,8 +258,7 @@ case 3:
         "3" /><fieldset> <legend><?php echo t('Information');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         "3" /><fieldset> <legend><?php echo t('Information');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo

-        t
-        ('The base address of Jirafeau is the first part of the URL, until ' .
+        t('The base address of Jirafeau is the first part of the URL, until ' .

          '(and including) the last slash. For example: ' .
          '"http://www.example.com/". Do not forget the trailing slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
          '(and including) the last slash. For example: ' .
          '"http://www.example.com/". Do not forget the trailing slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"


@@ -286,7 +266,7 @@ case 3:
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php

-        echo (empty($cfg['web_root']) ?
+        echo(empty($cfg['web_root']) ?

           'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
           '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
       ?>" size = "40" /></td>
           'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
           '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
       ?>" size = "40" /></td>


@@ -300,18 +280,18 @@ case 3:
     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root"
         id = "input_var_root" value = "<?php
     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root"
         id = "input_var_root" value = "<?php

-        if(empty($cfg['var_root'])) {
-          $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .
+        if (empty($cfg['var_root'])) {
+            $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' .

           'abcdefghijklmnopqrstuvwxyz' . '0123456789';
           'abcdefghijklmnopqrstuvwxyz' . '0123456789';

-          $len_alphanum = strlen($alphanum);
-          $var = 'var-';
-          for($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
-            $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
-          }
-          echo JIRAFEAU_ROOT . $var . '/';
+            $len_alphanum = strlen($alphanum);
+            $var = 'var-';
+            for ($i = 0; $i <JIRAFEAU_VAR_RAND_LENGTH; $i++) {
+                $var .= substr($alphanum, mt_rand(0, $len_alphanum - 1), 1);
+            }
+            echo JIRAFEAU_ROOT . $var . '/';
+        } else {
+            echo $cfg['var_root'];

         }
         }

-        else
-          echo $cfg['var_root'];

       ?>" size = "40" /></td>
         </tr> <tr> <td colspan = "2"><input type = "submit"
         class = "navleft" name = "previous" value = "<?php
       ?>" size = "40" /></td>
         </tr> <tr> <td colspan = "2"><input type = "submit"
         class = "navleft" name = "previous" value = "<?php


@@ -323,7 +303,7 @@ case 3:
 break;
 
 case 4:
 break;
 
 case 4:

-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
+    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .

     ' %d ' . t('out of') . ' %d', 4, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
     ' %d ' . t('out of') . ' %d', 4, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =


@@ -332,7 +312,7 @@ case 4:
         "4" /><fieldset> <legend><?php echo t('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         "4" /><fieldset> <legend><?php echo t('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo

-        t ('Jirafeau is setting the website according to the configuration ' .
+        t('Jirafeau is setting the website according to the configuration ' .

            'you provided.');
     ?></td> </tr> <tr> <td class = "nav previous"><input type =
         "submit" name = "previous" value =
            'you provided.');
     ?></td> </tr> <tr> <td class = "nav previous"><input type =
         "submit" name = "previous" value =


@@ -342,27 +322,23 @@ case 4:
     ?>" /></td> <td></td> </tr>
         </table> </fieldset> </form> </div>
     <?php
     ?>" /></td> <td></td> </tr>
         </table> </fieldset> </form> </div>
     <?php

-    $err = jirafeau_check_var_dir ($cfg['var_root']);
-    if ($err['has_error'])
-    {
-        echo '<div class="error"><p>'.$err['why'].'<br />'.NL;
-        ?><form method="post"> <input type = "hidden" name = "jirafeau" value =
+    $err = jirafeau_check_var_dir($cfg['var_root']);
+    if ($err['has_error']) {
+        echo '<div class="error"><p>'.$err['why'].'<br />'.NL; ?><form method="post"> <input type = "hidden" name = "jirafeau" value =

             "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
             "step" value = "4" /><input type = "submit" name =
             "retry" value =
             "<?php echo t('Retry this step'); ?>" /></form>
             <?php echo '</p></div>';
             "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
             "step" value = "4" /><input type = "submit" name =
             "retry" value =
             "<?php echo t('Retry this step'); ?>" /></form>
             <?php echo '</p></div>';

-    }
-    else
-    {
+    } else {

         $cfg['installation_done'] = true;
         $cfg['installation_done'] = true;

-        jirafeau_export_cfg ($cfg);
+        jirafeau_export_cfg($cfg);

         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .
         echo '<div class="message"><p>' .
              t('Jirafeau is now fully operational') . ':' .

-             '<br /><a href="' . $cfg['web_root'] . '">' .
+             '<br /><a href="./">' .

              $cfg['web_root'].'</a></p></div>';
     }
 break;
 }
 
              $cfg['web_root'].'</a></p></div>';
     }
 break;
 }
 

-require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+require(JIRAFEAU_ROOT . 'lib/template/footer.php');