[TASK] rework user auth

[jirafeau_mojo42.git] / install.php

diff --git a/install.php b/install.php
index a5e542027c4623e17832fa87336f568c91946dc4..6dbefb586e84463791d48a3b37db69f1ba82d7ef 100644 (file)
--- a/install.php
+++ b/install.php
@@ -47,23 +47,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php');
 if (!file_exists(JIRAFEAU_CFG)) {
     // show an error if it is not possible to create the file
     if (!@touch(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.')
-        );
+        jirafeau_fatal_error(t('CONF_SOLUTION'));

     }
 }
 
 // is the local configuration writable?
 if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
     }
 }
 
 // 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.')
-    );
+    jirafeau_fatal_error(t('CONF_SOLUTION_2'));

 }
 
 /**
 }
 
 /**


@@ -120,7 +110,7 @@ default:
        ><?php echo t('ADMIN_PSW') . ':';
     ?></label></td>
         <td class = "field"><input type = "password" name = "admin_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>
         </tr>
         <tr class = "nav">
         <td></td>


@@ -148,12 +138,7 @@ case 2:
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php
     ?></label></td>
         <td class = "field"><input type = "text" name = "web_root"
         id = "input_web_root" value = "<?php

-        echo(empty($cfg['web_root']) ?
-          $_SERVER['HTTP_HOST'] . str_replace(
-              basename(__FILE__),
-              '',
-              $_SERVER['REQUEST_URI']
-          ) : $cfg['web_root']);
+           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('DATA_DIR_EXPLAINATION');
       ?>" size = "40" /></td>
         </tr> <tr> <td class = "info" colspan = "2"><?php
         echo t('DATA_DIR_EXPLAINATION');