X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/c447f2d7c18e5e89d83b420a8c706fbfa07c9b85..6cdb006ec660dc477c857a95601e3ba50244add0:/install.php?ds=sidebyside

diff --git a/install.php b/install.php
index 2739bc8..bd2aea3 100644
--- a/install.php
+++ b/install.php
@@ -69,12 +69,12 @@ function jirafeau_is_writable($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.');
-    $write_str1 = t('The following directory is not writable') . ':';
+    $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':';
+    $mkdir_str2 = t('MANUAL_CREATE');
+    $write_str1 = t('DIR_NOT_W') . ':';
     $write_str2 = t('You should give the write permission to the web server on ' .
                     'this directory.');
-    $solution_str = t('Here is a solution') . ':';
+    $solution_str = t('HERE_SOLUTION') . ':';
 
     if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
         return array('has_error' => true,
@@ -83,7 +83,7 @@ function jirafeau_check_var_dir($path)
                                '<br />' . $mkdir_str2);
     }
 
-    foreach (array('files', 'links', 'async', 'alias') as $subdir) {
+    foreach (array('files', 'links', 'async') as $subdir) {
         $subpath = $path.$subdir;
 
         if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
@@ -154,7 +154,11 @@ if (isset($_POST['step']) && isset($_POST['next'])) {
         break;
 
     case 2:
-        $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+        if (strlen($_POST['admin_password'])) {
+            $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+        } else {
+            $cfg['admin_password'] = '';
+        }
         jirafeau_export_cfg($cfg);
         break;
 
@@ -184,8 +188,8 @@ if (isset($_POST['next'])) {
 switch ($current) {
 case 1:
 default:
-    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 1, 4);
+    ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+    ' %d ' . t('OUT_OF') . ' %d', 1, 4);
     ?></h2> <div id = "install"> <form method="post"> <input type =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
@@ -195,7 +199,7 @@ default:
         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') . ':';
+       ><?php echo t('DEF_LANGUAGE') . ':';
     ?></label></td>
         <td class = "field">
         <select name = "lang" id = "select_lang">
@@ -210,25 +214,25 @@ default:
         <tr class = "nav">
         <td></td>
         <td class = "nav next"><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 2:
-    ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') .
-    ' %d ' . t('out of') . ' %d', 2, 4);
+    ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+    ' %d ' . t('OUT_OF') . ' %d', 2, 4);
     ?></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');
+        echo t('ADMIN_PSW');
     ?></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') . ':';
+       ><?php echo t('ADMIN_PSW') . ':';
     ?></label></td>
         <td class = "field"><input type = "password" name = "admin_password"
         id = "admin_password" size = "40" /></td>
@@ -238,27 +242,27 @@ case 2:
         <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><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+    ' %d ' . t('OUT_OF') . ' %d', 3, 4);
     ?></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');
+        "3" /><fieldset> <legend><?php echo t('INFO');
     ?></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') . ':';
+       ><?php echo t('BASE_ADDR') . ':';
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
@@ -272,7 +276,7 @@ case 3:
         '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') . ':';
+       ><?php echo t('DATA_DIR') . ':';
     ?></label></td>
         <td class = "field"><input type = "text" name = "var_root"
         id = "input_var_root" value = "<?php
@@ -291,21 +295,21 @@ case 3:
       ?>" size = "40" /></td>
         </tr> <tr> <td colspan = "2"><input type = "submit"
         class = "navleft" name = "previous" value = "<?php
-        echo t('Previous step'); ?>" />
+        echo t('PREV_STEP'); ?>" />
          <input type = "submit" class = "navright" name = "next" value = "
-        <?php echo t('Next step'); ?>" />
+        <?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><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') .
+    ' %d ' . t('OUT_OF') . ' %d', 4, 4);
     ?></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');
+        "4" /><fieldset> <legend><?php echo t('FINALIZATION');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
         t('Jirafeau is setting the website according to the configuration ' .
@@ -314,7 +318,7 @@ case 4:
         "submit" name = "previous" value =
         "
     <?php
-    echo t('Previous step');
+    echo t('PREV_STEP');
     ?>" /></td> <td></td> </tr>
         </table> </fieldset> </form> </div>
     <?php
@@ -324,14 +328,14 @@ case 4:
             "<?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 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'] . '">' .
+             t('JI_FONCTIONAL') . ':' .
+             '<br /><a href="./">' .
              $cfg['web_root'].'</a></p></div>';
     }
 break;