X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/9a9c9a8bf83241c193c5bef6361d41893e72dfd3..d598ed64ed220d9bc3113add823c93310c68ad38:/install.php?ds=sidebyside
diff --git a/install.php b/install.php
index 9e05b8c..8d5f6fb 100644
--- a/install.php
+++ b/install.php
@@ -38,9 +38,9 @@ function jirafeau_quoted($str)
function jirafeau_export_cfg($cfg)
{
$content = ' true,
@@ -83,7 +83,7 @@ function jirafeau_check_var_dir($path)
'
' . $mkdir_str2);
}
- foreach (array('files', 'links', 'async', 'alias') as $subdir) {
+ foreach (array('files', 'links', 'async') as $subdir) {
$subpath = $path.$subdir;
if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
@@ -102,13 +102,6 @@ function jirafeau_add_ending_slash($path)
return $path . ((substr($path, -1) == '/') ? '' : '/');
}
-function jirafeau_fatal_error($errorText)
-{
- echo '
';
- require(JIRAFEAU_ROOT . 'lib/template/footer.php');
- exit;
-}
-
/**
* Check installation
**/
@@ -156,22 +149,21 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
if (isset($_POST['step']) && isset($_POST['next'])) {
switch ($_POST['step']) {
case 1:
- $cfg['lang'] = $_POST['lang'];
+ 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);
- 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:
+ 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);
@@ -191,51 +183,17 @@ if (isset($_POST['next'])) {
switch ($current) {
case 1:
default:
- ?>
'.$err['why'].'
'.NL; ?>
+ "" />
';
} else {
$cfg['installation_done'] = true;
jirafeau_export_cfg($cfg);
echo '';
}
break;