X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..0c2a55c003682345fb1af7ae2fde73c79ee36fde:/install.php?ds=sidebyside diff --git a/install.php b/install.php index 9e05b8c..b729be5 100644 --- a/install.php +++ b/install.php @@ -69,12 +69,12 @@ function jirafeau_is_writable($path) function jirafeau_check_var_dir($path) { - $mkdir_str1 = t('The following directory could not be created') . ':'; - $mkdir_str2 = t('You should create this directory manually.'); - $write_str1 = t('The following directory is not writable') . ':'; + $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':'; + $mkdir_str2 = t('MANUAL_CREATE'); + $write_str1 = t('DIR_NOT_W') . ':'; $write_str2 = t('You should give the write permission to the web server on ' . 'this directory.'); - $solution_str = t('Here is a solution') . ':'; + $solution_str = t('HERE_SOLUTION') . ':'; if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) { return array('has_error' => 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 '

Error

' . $errorText . '

'; - 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: - ?>

" />
- - - - -
- -
-

@@ -245,41 +203,35 @@ 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;