X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/9a9c9a8bf83241c193c5bef6361d41893e72dfd3..36e0d29e64f711ed170d431542cf62eeb42b96d7:/install.php?ds=sidebyside diff --git a/install.php b/install.php index 9e05b8c..a5e5420 100644 --- a/install.php +++ b/install.php @@ -26,89 +26,6 @@ require(JIRAFEAU_ROOT . 'lib/settings.php'); require(JIRAFEAU_ROOT . 'lib/functions.php'); require(JIRAFEAU_ROOT . 'lib/lang.php'); -/** - * Prepend used functions - **/ - -function jirafeau_quoted($str) -{ - return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE; -} - -function jirafeau_export_cfg($cfg) -{ - $content = ' true, - 'why' => $mkdir_str1 . '
' . - $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 '

Error

' . $errorText . '

'; - require(JIRAFEAU_ROOT . 'lib/template/footer.php'); - exit; -} - /** * Check installation **/ @@ -156,22 +73,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 +107,17 @@ if (isset($_POST['next'])) { switch ($current) { case 1: default: - ?>

- - - - -
- -
-

" />
@@ -245,41 +127,38 @@ case 2:
+ "" />

- + echo t('PREV_STEP'); ?>" /> + " />

'.$err['why'].'
'.NL; ?>

" />
+ "" /> '; } else { $cfg['installation_done'] = true; jirafeau_export_cfg($cfg); echo '

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

'; } break;