Adding a very nice theme from JordyValentine

[jirafeau.git] / install.php

diff --git a/install.php b/install.php
index 7ebc7bfb21d5954d42fa7580bc05c6c979e05dc1..958aa1eef5809d4a80680cfb6d2b421bedb30420 100644 (file)
--- a/install.php
+++ b/install.php
@@ -2,6 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>

+ *  Copyright (C) 2015  Nicola Spanti (RyDroid) <dev@nicola-spanti.info>

  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as


@@ -14,7 +15,7 @@
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License
  *  GNU Affero General Public License for more details.
  *
  *  You should have received a copy of the GNU Affero General Public License

- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.

  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 define ('NL', "\n");
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 define ('NL', "\n");


@@ -67,9 +68,7 @@ jirafeau_export_cfg ($cfg)
 function
 jirafeau_mkdir ($path)
 {
 function
 jirafeau_mkdir ($path)
 {

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

 }
 
 /**
 }
 
 /**


@@ -89,7 +88,7 @@ function
 jirafeau_check_var_dir ($path)
 {
     $mkdir_str1 = t('The following directory could not be created') . ':';
 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 permission to the web server on ' .
                     'this directory.');
     $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.');


@@ -101,7 +100,7 @@ jirafeau_check_var_dir ($path)
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 
                                $path . '</code><br />' . $solution_str .
                                '<br />' . $mkdir_str2);
 

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

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


@@ -167,7 +166,7 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
         break;
 
     case 2:
         break;
 
     case 2:

-        $cfg['admin_password'] = $_POST['admin_password'];
+        $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);

         jirafeau_export_cfg ($cfg);
         break;
 
         jirafeau_export_cfg ($cfg);
         break;
 


@@ -182,8 +181,6 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
         $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
         jirafeau_export_cfg ($cfg);
         break;
         $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
         jirafeau_export_cfg ($cfg);
         break;

-
-    default: break;

     }
 
 }
     }
 
 }


@@ -249,7 +246,7 @@ case 2:
         "2"><?php echo
         t
         ('Jirafeau has an administration interface (through admin.php). ' .
         "2"><?php echo
         t
         ('Jirafeau has an administration interface (through admin.php). ' .

-        'You can set a password to access the interface or leave 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') . ':';
         'to disable the interface.');
     ?></td> </tr> <tr> <td class = "label"><label for = "select_password"
        ><?php echo t('Administration password') . ':';


@@ -282,7 +279,7 @@ case 3:
         t
         ('The base address of Jirafeau is the first part of the URL, until ' .
          '(and including) the last slash. For example: ' .
         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>
     ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
        ><?php echo t('Base address') . ':';
     ?></label></td>


@@ -296,7 +293,7 @@ case 3:
         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 ' .
         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 ending slash!');
+        'forget the trailing slash!');

     ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
        ><?php echo t('Data directory') . ':';
     ?></label></td>
     ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
        ><?php echo t('Data directory') . ':';
     ?></label></td>