X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/3cf8b39b331dd5f80c4ac674d13a6387d01d49b9..3d9792a36b5bb18d24216eea4b0ad402358db997:/install.php?ds=sidebyside

diff --git a/install.php b/install.php
old mode 100644
new mode 100755
index 8a34477..d8e5fdf
--- a/install.php
+++ b/install.php
@@ -23,7 +23,8 @@ define ('QUOTE', "'");
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/lang.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
 
 function
 jirafeau_quoted ($str)
@@ -38,8 +39,8 @@ jirafeau_export_cfg ($cfg)
     fwrite ($handle, '<?php' . NL);
     fwrite ($handle,
             '/* ' .
-            _ ('This file was generated by the install process. ' .
-               'You can edit it. Please see config.php to understand the ' .
+            t ('This file was generated by the install process. ' .
+               'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL);
     foreach ($cfg as $key => $item)
     {
@@ -48,6 +49,8 @@ jirafeau_export_cfg ($cfg)
             fwrite ($handle, ($item ? 'true' : 'false'));
         else if (is_string ($item))
             fwrite ($handle, jirafeau_quoted ($item));
+        else if (is_int ($item))
+            fwrite ($handle, $item);
         else
             fwrite ($handle, 'null');
         fwrite ($handle, ';'.NL);
@@ -81,12 +84,12 @@ jirafeau_is_writable ($path)
 function
 jirafeau_check_var_dir ($path)
 {
-    $mkdir_str1 = _('The following directory could not be created:');
-    $mkdir_str2 = _('You should create this directory by hand.');
-    $write_str1 = _('The following directory is not writable:');
-    $write_str2 = _('You should give the write right to the web server on ' .
+    $mkdir_str1 = t('The following directory could not be created') . ':';
+    $mkdir_str2 = t('You should create this directory by hand.');
+    $write_str1 = t('The following directory is not writable') . ':';
+    $write_str2 = t('You should give the write right to the web server on ' .
                     'this directory.');
-    $solution_str = _('Here is a solution:');
+    $solution_str = t('Here is a solution') . ':';
 
     if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
         return array ('has_error' => true,
@@ -94,7 +97,7 @@ jirafeau_check_var_dir ($path)
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 
-    foreach (array ('files', 'links') as $subdir)
+    foreach (array ('files', 'links', 'async', 'block') as $subdir)
     {
         $subpath = $path.$subdir;
 
@@ -121,7 +124,7 @@ if (!file_exists (JIRAFEAU_CFG))
     {
         require (JIRAFEAU_ROOT . 'lib/template/header.php');
         echo '<div class="error"><p>' .
-             _('The local configuration file could not be created. Create a ' .
+             t('The local configuration file could not be created. Create a ' .
                '<code>lib/config.local.php</code> file and give the write ' .
                'right to the web server (preferred solution), or give the ' .
                'write right to the web server on the <code>lib</code> ' .
@@ -136,7 +139,7 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
 {
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
     echo '<div class="error"><p>' .
-         _('The local configuration is not writable by the web server. ' .
+         t('The local configuration is not writable by the web server. ' .
            'Give the write right to the web server on the ' .
            '<code>lib/config.local.php</code> file.') .
          '</p></div>';
@@ -154,6 +157,17 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
         break;
 
     case 2:
+        $cfg['admin_password'] = $_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);
@@ -177,123 +191,171 @@ else if (isset ($_POST['retry']))
 
 switch ($current)
 {
-case 3:
-    ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
-                         3, 3);
+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 =
-        "3" /><fieldset> <legend><?php echo _('Finalisation');
+        "step" value = "1" /><fieldset> <legend><?php echo t('Language');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        _
-        ('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 _('Previous 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 =
-            "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
-            "step" value = "3" /><input type = "submit" name =
-            "retry" value =
-            "<?php echo _('Retry this step'); ?>" /></form>
-            <?php echo '</p></div>';
-    }
-    else
+        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 '<div class="message"><p>' .
-             _('Your website is now fully operational:') .
-             '<br /><a href="' . $cfg['web_root'] . '">' .
-             $cfg['web_root'].'</a></p></div>';
+        echo '<option value="'.$key.'"'.($key ==
+                      $cfg['lang'] ? ' selected="selected"'
+                      : '').'>'.$item.'</option>'.NL;
     }
-    break;
-
+    ?></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 (_('Installation of Jirafeau - step %d out of %d'),
-                            2, 3);
+    ?><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 =
+        "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 intercace or let it be empty ' .
+        'to disable the interface.');
+    ?></td> </tr> <tr> <td class = "label"><label for = "select_password"
+       ><?php echo t('Administration password') . ':';
+    ?></label></td>
+        <td class = "field"><input type = "password" name = "admin_password"
+        id = "admin_password" size = "40" /></td>
+        </tr>
+        <tr class = "nav">
+        <td></td>
+        <td class = "nav next">
+        <input type = "submit"
+        class = "navleft" name = "previous" value = "<?php
+        echo t('Previous step'); ?>" />
+        <input type = "submit" name = "next" value =
+        "<?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 =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
         "step" value =
-        "2" /><fieldset> <legend><?php echo _('Information');
+        "3" /><fieldset> <legend><?php echo t('Information');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        _
-        ('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 ending slash!');
+        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 ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
-       ><?php echo _('Base address:');
+       ><?php echo t('Base address') . ':';
     ?></label></td>
-        <td class = "field"><input type = "text" name = "web_root" id = "input_web_root" value = "<?php
+        <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']);
+          'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__),
+          '', $_SERVER['REQUEST_URI']) : $cfg['web_root']);
       ?>" size = "40" /></td>
-        </tr> <tr> <td class = "info" colspan = "2"><?php echo _('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 of this directory. Do not forget the ending slash!');
+        </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 of this directory. Do not ' .
+        'forget the ending slash!');
     ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
-       ><?php echo _('Data directory:');
+       ><?php echo t('Data directory') . ':';
     ?></label></td>
-        <td class = "field"><input type = "text" name = "var_root" id = "input_var_root" value = "<?php
+        <td class = "field"><input type = "text" name = "var_root"
+        id = "input_var_root" value = "<?php
         if(empty($cfg['var_root'])) {
-          $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+          $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 {
+        }
+        else
           echo $cfg['var_root'];
-        } 
       ?>" size = "40" /></td>
-        </tr> <tr> <td colspan = "2"> <input type = "submit" class = "navright" name = "next" value = "<?php echo _('Next step'); ?>" /><input type = "submit" class = "navleft" name = "previous" value = "<?php echo _('Previous step'); ?>" /></td> </tr> </table> </fieldset> </form> </div> <?php break;
+        </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'); ?>" />
+        </td> </tr> </table> </fieldset>
+        </form> </div> <?php
+break;
 
-case 1:
-default:
-    $languages = array ('' => 'English', 'fr_FR.UTF-8' => 'Français');
-    ?><h2><?php printf (_('Installation of Jirafeau - step %d out of %d'),
-                            1, 3);
+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 =
         "hidden" name = "jirafeau" value =
         "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
-        "step" value = "1" /><fieldset> <legend><?php echo _('Language');
+        "step" value =
+        "4" /><fieldset> <legend><?php echo t('Finalisation');
     ?></legend> <table> <tr> <td class = "info" colspan =
         "2"><?php echo
-        _
-        ('The installation of Jirafeau is internationalised, so you can have it in your own language if the translation is available.');
-    ?></td> </tr> <tr> <td class = "label"><label for = "select_lang"
-       ><?php echo _('Choose your language:');
-    ?></label></td>
-        <td class = "field">
-        <select name = "lang" id = "select_lang">
-        <?php foreach ($languages as $key => $item)
+        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>
+        </table> </fieldset> </form> </div>
+    <?php
+    $err = jirafeau_check_var_dir ($cfg['var_root']);
+    if ($err['has_error'])
     {
-        echo '<option value="'.$key.'"'.($key ==
-                                         $cfg['lang'] ? ' selected="selected"'
-                                         : '').'>'.$item.'</option>'.NL;
+        echo '<div class="error"><p>'.$err['why'].'<br />'.NL;
+        ?><form action = "<?php echo basename(__FILE__); ?>" 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>';
     }
-    ?></select>
-        </td>
-        </tr>
-        <tr class = "nav">
-        <td></td>
-        <td class = "nav next"><input type = "submit" name = "next" value =
-        "<?php echo _('Next step'); ?>" /></td> </tr> </table>
-        </fieldset> </form> </div> <?php break;
+    else
+    {
+        echo '<div class="message"><p>' .
+             t('Jirafeau is now fully operational') . ':' .
+             '<br /><a href="' . $cfg['web_root'] . '">' .
+             $cfg['web_root'].'</a></p></div>';
+    }
+break;
 }
 
-
 require (JIRAFEAU_ROOT . 'lib/template/footer.php');
 ?>