X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/50f88df47f6d5b3cb5dc20fb2e9d3022862adbcf..8665ea5fc150ca65125f24023b545fe39bdb2a95:/install.php
diff --git a/install.php b/install.php
index fbd3667..705f3d6 100644
--- a/install.php
+++ b/install.php
@@ -17,103 +17,14 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see ' .
- $path . '
' . $solution_str .
- '
' . $mkdir_str2);
-
- foreach (array ('files', 'links', 'async', 'alias') as $subdir)
- {
- $subpath = $path.$subdir;
-
- if (!jirafeau_mkdir ($subpath) || !jirafeau_is_writable ($subpath))
- return array ('has_error' => true,
- 'why' => $mkdir_str1 . '' .
- $subpath . '
' . $solution_str .
- '
' . $mkdir_str2);
- }
-
- return array ('has_error' => false, 'why' => '');
-}
-
-function
-jirafeau_add_ending_slash ($path)
-{
- return $path . ((substr ($path, -1) == '/') ? '' : '/');
-}
-
-function
-jirafeau_fatal_error($errorText)
-{
- echo '
' . $errorText . '
lib/config.local.php
file and give the write ' .
@@ -150,8 +58,7 @@ if (!file_exists (JIRAFEAU_CFG))
}
// is the local configuration writable?
-if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
-{
+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 ' .
@@ -163,206 +70,147 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
* Run trough each installation step
**/
-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
- switch ($_POST['step'])
- {
+if (isset($_POST['step']) && isset($_POST['next'])) {
+ switch ($_POST['step']) {
case 1:
- $cfg['lang'] = $_POST['lang'];
- jirafeau_export_cfg ($cfg);
+ if (strlen($_POST['admin_password'])) {
+ $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
+ } else {
+ $cfg['admin_password'] = '';
+ }
+ jirafeau_export_cfg($cfg);
break;
case 2:
- $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
- jirafeau_export_cfg ($cfg);
+ $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 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);
+ $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;
}
-
}
$current = 1;
-if (isset ($_POST['next']))
+if (isset($_POST['next'])) {
$current = $_POST['step'] + 1;
-else if (isset ($_POST['previous']))
+} elseif (isset($_POST['previous'])) {
$current = $_POST['step'] - 1;
-else if (isset ($_POST['retry']))
+} elseif (isset($_POST['retry'])) {
$current = $_POST['step'];
+}
-switch ($current)
-{
+switch ($current) {
case 1:
default:
- ?> '.$err['why'].'
'.NL;
- ?>