X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/8446aee16b869be5235e55068ffeb76b163dac79..b6fd6265770c82539cfb26d053e0345fe32060e0:/install.php

diff --git a/install.php b/install.php
old mode 100755
new mode 100644
index a3db15b..451ebe3
--- a/install.php
+++ b/install.php
@@ -23,8 +23,9 @@ define ('QUOTE', "'");
 define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php');
 define ('JIRAFEAU_VAR_RAND_LENGTH', 15);
 
+require (JIRAFEAU_ROOT . 'lib/functions.php');
 require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
 
 function
 jirafeau_quoted ($str)
@@ -40,7 +41,7 @@ jirafeau_export_cfg ($cfg)
     fwrite ($handle,
             '/* ' .
             t ('This file was generated by the install process. ' .
-               'You can edit it. Please see config.php to understand the ' .
+               'You can edit it. Please see config.original.php to understand the ' .
                'configuration items.') . ' */' . NL);
     foreach ($cfg as $key => $item)
     {
@@ -49,6 +50,11 @@ 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 if (is_array ($item))
+            fwrite ($handle, str_replace(array("\n", "\r"), "",
+                                         var_export ($item, true)));
         else
             fwrite ($handle, 'null');
         fwrite ($handle, ';'.NL);
@@ -83,9 +89,9 @@ function
 jirafeau_check_var_dir ($path)
 {
     $mkdir_str1 = t('The following directory could not be created') . ':';
-    $mkdir_str2 = t('You should create this directory by hand.');
+    $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 right to the web server on ' .
+    $write_str2 = t('You should give the write permission to the web server on ' .
                     'this directory.');
     $solution_str = t('Here is a solution') . ':';
 
@@ -95,7 +101,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') as $subdir)
     {
         $subpath = $path.$subdir;
 
@@ -115,6 +121,12 @@ jirafeau_add_ending_slash ($path)
     return $path . ((substr ($path, -1) == '/') ? '' : '/');
 }
 
+if ($cfg['installation_done'] === true)
+{
+    header('Location: index.php');
+    exit;
+}
+
 if (!file_exists (JIRAFEAU_CFG))
 {
     /* We try to create an empty one. */
@@ -124,8 +136,8 @@ if (!file_exists (JIRAFEAU_CFG))
         echo '<div class="error"><p>' .
              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> ' .
+               'permission to the web server (preferred solution), or give the ' .
+               'write permission to the web server on the <code>lib</code> ' .
                'directory.') .
              '</p></div>';
         require (JIRAFEAU_ROOT . 'lib/template/footer.php');
@@ -138,7 +150,7 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
     echo '<div class="error"><p>' .
          t('The local configuration is not writable by the web server. ' .
-           'Give the write right to the web server on the ' .
+           'Give the write permission to the web server on the ' .
            '<code>lib/config.local.php</code> file.') .
          '</p></div>';
     require (JIRAFEAU_ROOT . 'lib/template/footer.php');
@@ -237,7 +249,7 @@ case 2:
         "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 ' .
+        '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') . ':';
@@ -270,7 +282,7 @@ case 3:
         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!');
+         '"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>
@@ -283,8 +295,8 @@ case 3:
         </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!');
+        '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>
@@ -347,6 +359,8 @@ case 4:
     }
     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'] . '">' .