X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/e1c30044b1fa083d89b4bf8f0265fb2785583411..d8f36ea1fdc5bcfff3f193fea7625e7c2afd49d9:/install.php?ds=sidebyside

diff --git a/install.php b/install.php
index df4f106..ed99b19 100644
--- a/install.php
+++ b/install.php
@@ -17,104 +17,14 @@
  *  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 ('NL', "\n");
-define ('QUOTE', "'");
-define ('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
-define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
+define('JIRAFEAU_ROOT', dirname(__FILE__) . '/');
 
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
+define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php');
+define('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
-/**
- * Prepend used functions
- **/
-
-function
-jirafeau_quoted ($str)
-{
-    return QUOTE . str_replace (QUOTE, "\'", $str) . QUOTE;
-}
-
-function
-jirafeau_export_cfg ($cfg)
-{
-    $content = '<?php' . NL;
-    $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) . ';';
-
-    $fileWrite = file_put_contents(JIRAFEAU_CFG, $content);
-
-    if (false === $fileWrite) {
-        jirafeau_fatal_error(t('Can not write local configuration file'));
-    }
-}
-
-function
-jirafeau_mkdir ($path)
-{
-    return !(!file_exists ($path) && !@mkdir ($path, 0755));
-}
-
-/**
- * Returns true whether the path is writable or we manage to make it
- * so, which essentially is the same thing.
- * @param $path is the file or directory to be tested.
- * @return true if $path is writable.
- */
-function
-jirafeau_is_writable ($path)
-{
-    /* "@" gets rid of error messages. */
-    return is_writable ($path) || @chmod ($path, 0777);
-}
-
-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.');
-    $write_str1 = t('The following directory is not writable') . ':';
-    $write_str2 = t('You should give the write permission to the web server on ' .
-                    'this directory.');
-    $solution_str = t('Here is a solution') . ':';
-
-    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);
-
-    foreach (array ('files', 'links', 'async', 'alias') as $subdir)
-    {
-        $subpath = $path.$subdir;
-
-        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);
-    }
-
-    return array ('has_error' => false, 'why' => '');
-}
-
-function
-jirafeau_add_ending_slash ($path)
-{
-    return $path . ((substr ($path, -1) == '/') ? '' : '/');
-}
-
-function
-jirafeau_fatal_error($errorText)
-{
-    echo '<div class="error"><h2>Error</h2><p>' . $errorText . '</p></div>';
-    require (JIRAFEAU_ROOT . 'lib/template/footer.php');
-    exit;
-}
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
 
 /**
  * Check installation
@@ -122,253 +32,175 @@ jirafeau_fatal_error($errorText)
 
 // 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
  **/
 
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
 
 // 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
-    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 ' .
-               'permission to the web server (preferred solution), or give the ' .
-               'write permission to the web server on the <code>lib</code> ' .
-               'directory.')
-        );
+    if (!@touch(JIRAFEAU_CFG)) {
+        jirafeau_fatal_error(t('CONF_SOLUTION'));
     }
 }
 
 // is the local configuration writable?
-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 ' .
-            '<code>lib/config.local.php</code> file.')
-    );
+if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
+    jirafeau_fatal_error(t('CONF_SOLUTION_2'));
 }
 
 /**
  * Run trough each installation step
  **/
 
-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
-    switch ($_POST['step'])
-    {
-    case 1:
-        $cfg['lang'] = $_POST['lang'];
-        jirafeau_export_cfg ($cfg);
-        break;
-
-    case 2:
-        $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
-        jirafeau_export_cfg ($cfg);
-        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);
-        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);
-        break;
+if (isset($_POST['step']) && isset($_POST['next'])) {
+    switch ($_POST['step']) {
+        case 1:
+            if (strlen($_POST['admin_password'])) {
+                $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+            } else {
+                $cfg['admin_password'] = '';
+            }
+            jirafeau_export_cfg($cfg);
+            break;
+
+        case 2:
+            $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 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);
+            break;
     }
-
 }
 
 $current = 1;
-if (isset ($_POST['next']))
+if (isset($_POST['next'])) {
     $current = $_POST['step'] + 1;
-else if (isset ($_POST['previous']))
+} elseif (isset($_POST['previous'])) {
     $current = $_POST['step'] - 1;
-else if (isset ($_POST['retry']))
+} elseif (isset($_POST['retry'])) {
     $current = $_POST['step'];
+}
 
-switch ($current)
-{
-case 1:
-default:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 1, 4);
-    ?></h2> <div id = "install"> <form action =
-        "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
-        "hidden" name = "jirafeau" value =
-        "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
-        "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 ' .
-         '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)
-    {
-        echo '<option value="'.$key.'"'.($key ==
-                      $cfg['lang'] ? ' selected="selected"'
-                      : '').'>'.$item.'</option>'.NL;
-    }
-    ?></select>
-        </td>
-        </tr>
-        <tr class = "nav">
-        <td></td>
-        <td class = "nav next"><input type = "submit" name = "next" value =
-        "<?php echo t('Next step'); ?>" /></td> </tr> </table>
-        </fieldset> </form> </div> <?php
-break;
-
-case 2:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 2, 4);
-    ?></h2> <div id = "install"> <form action =
-        "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
+switch ($current) {
+    case 1:
+    default:
+        ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+        ' %d ' . t('OUT_OF') . ' %d', 1, 3);
+        ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
-        "step" value = "2" /><fieldset> <legend><?php
-        echo t('Administration password');
-    ?></legend> <table> <tr> <td class = "info" colspan =
-        "2"><?php echo
-        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"
-       ><?php echo t('Administration password') . ':';
-    ?></label></td>
+        "step" value = "1" /><fieldset> <legend><?php
+            echo t('ADMIN_PSW');
+        ?></legend> <table> <tr> <td class = "info" colspan =
+        "2"><?php echo t('ADMIN_INTERFACE_INFO');
+        ?></td> </tr> <tr> <td class = "label"><label for = "select_password"
+       ><?php echo t('ADMIN_PSW') . ':';
+        ?></label></td>
         <td class = "field"><input type = "password" name = "admin_password"
-        id = "admin_password" size = "40" /></td>
+        id = "admin_password" size = "40" autocomplete = "new-password"/></td>
         </tr>
         <tr class = "nav">
         <td></td>
         <td class = "nav next">
         <input type = "submit"
         class = "navleft" name = "previous" value = "<?php
-        echo t('Previous step'); ?>" />
+            echo t('PREV_STEP'); ?>" />
         <input type = "submit" name = "next" value =
-        "<?php echo t('Next step'); ?>" /></td> </tr> </table>
+        "<?php echo t('NEXT_STEP'); ?>" /></td> </tr> </table>
         </fieldset> </form> </div> <?php
 break;
 
-case 3:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 3, 4);
-    ?></h2> <div id = "install"> <form action =
-        "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
+    case 2:
+        ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+        ' %d ' . t('OUT_OF') . ' %d', 2, 3);
+        ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
         "step" value =
-        "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 ' .
-         '(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"
-       ><?php echo t('Base address') . ':';
-    ?></label></td>
+        "2" /><fieldset> <legend><?php echo t('INFO');
+        ?></legend> <table> <tr> <td class = "info" colspan =
+        "2"><?php echo t('BASE_ADDR_INFO');
+        ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
+       ><?php echo t('BASE_ADDR') . ':';
+        ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
-        echo (empty($cfg['web_root']) ?
-          'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
-          '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
-      ?>" size = "40" /></td>
+               echo(empty($cfg['web_root']) ? jirafeau_default_web_root() : $cfg['web_root']);
+        ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php
-        echo t('The data directory is where your files and information about' .
-        ' your files will be stored. You should put it outside your web ' .
-        'site, or at least restrict the access to this directory. Do not ' .
-        'forget the trailing slash!');
-    ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
-       ><?php echo t('Data directory') . ':';
-    ?></label></td>
+          echo t('DATA_DIR_EXPLAINATION');
+        ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
+       ><?php echo t('DATA_DIR') . ':';
+        ?></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';
-          $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'];
-      ?>" size = "40" /></td>
+                $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'];
+            }
+        ?>" size = "40" /></td>
         </tr> <tr> <td colspan = "2"><input type = "submit"
         class = "navleft" name = "previous" value = "<?php
-        echo t('Previous step'); ?>" />
-         <input type = "submit" class = "navright" name = "next" value = "
-        <?php echo t('Next step'); ?>" />
+          echo t('PREV_STEP'); ?>" />
+         <input type = "submit" class = "navright" name = "next" value = 
+        "<?php echo t('NEXT_STEP'); ?>" />
         </td> </tr> </table> </fieldset>
         </form> </div> <?php
 break;
 
-case 4:
-    ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 4, 4);
-    ?></h2> <div id = "install"> <form action =
-        "<?php echo basename(__FILE__); ?>" method = "post"> <input type =
+    case 3:
+        ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+        ' %d ' . t('OUT_OF') . ' %d', 3, 3);
+        ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
         "step" value =
-        "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 ' .
-           'you provided.');
-    ?></td> </tr> <tr> <td class = "nav previous"><input type =
-        "submit" name = "previous" value =
-        "
-    <?php
-    echo t('Previous step');
-    ?>" /></td> <td></td> </tr>
+        "3" /><fieldset> <legend><?php echo t('FINALIZATION');
+        ?></legend> <table> <tr> <td class = "info" colspan =
+        "2"><?php echo t('SETTING_UP');
+        ?></td> </tr> <tr> <td class = "nav previous"><input type =
+        "submit" name = "previous" value = " <?php echo t('PREV_STEP');
+        ?>" /></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 action = "<?php echo basename(__FILE__); ?>" 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 =
+            "step" value = "3" /><input type = "submit" name =
             "retry" value =
-            "<?php echo t('Retry this step'); ?>" /></form>
+            "<?php echo t('RETRY_STEP'); ?>" /></form>
             <?php echo '</p></div>';
-    }
-    else
-    {
-        $cfg['installation_done'] = true;
-        jirafeau_export_cfg ($cfg);
-        echo '<div class="message"><p>' .
-             t('Jirafeau is now fully operational') . ':' .
-             '<br /><a href="' . $cfg['web_root'] . '">' .
-             $cfg['web_root'].'</a></p></div>';
-    }
-break;
+        } else {
+            $cfg['installation_done'] = true;
+            jirafeau_export_cfg($cfg);
+            echo '<div class="message"><p>' .
+                 t('JI_FONCTIONAL') . ':' .
+                 '<br /><a href="./">' .
+                 $cfg['web_root'].'</a></p></div>';
+        }
+        break;
 }
 
-require (JIRAFEAU_ROOT . 'lib/template/footer.php');
+require(JIRAFEAU_ROOT . 'lib/template/footer.php');