X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..42fe16a545b2d7ef3a476dc347594384ac41a403:/install.php diff --git a/install.php b/install.php index 9e05b8c..8c0f686 100644 --- a/install.php +++ b/install.php @@ -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 '

Error

' . $errorText . '

'; - require(JIRAFEAU_ROOT . 'lib/template/footer.php'); - exit; -} - /** * Check installation **/ @@ -161,7 +154,11 @@ if (isset($_POST['step']) && isset($_POST['next'])) { break; case 2: - $cfg['admin_password'] = hash('sha256', $_POST['admin_password']); + if (strlen($_POST['admin_password'])) { + $cfg['admin_password'] = hash('sha256', $_POST['admin_password']); + } else { + $cfg['admin_password'] = ''; + } jirafeau_export_cfg($cfg); break; @@ -338,7 +335,7 @@ case 4: jirafeau_export_cfg($cfg); echo '

' . t('Jirafeau is now fully operational') . ':' . - '
' . + '
' . $cfg['web_root'].'

'; } break;