X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/ec83f46ba45cbbbd25cc29a5de0082cba715f3a7..bdc22082b2d74f2d71fc6e52f49711c9fa18aa8d:/install.php?ds=inline diff --git a/install.php b/install.php index 1210753..ed99b19 100644 --- a/install.php +++ b/install.php @@ -26,82 +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') 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) == '/') ? '' : '/'); -} - /** * Check installation **/ @@ -123,23 +47,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php'); if (!file_exists(JIRAFEAU_CFG)) { // show an error if it is not possible to create the file if (!@touch(JIRAFEAU_CFG)) { - jirafeau_fatal_error( - t('The local configuration file could not be created. Create a ' . - 'lib/config.local.php file and give the write ' . - 'permission to the web server (preferred solution), or give the ' . - 'write permission to the web server on the lib ' . - 'directory.') - ); + jirafeau_fatal_error(t('CONF_SOLUTION')); } } // is the local configuration writable? 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 ' . - 'lib/config.local.php file.') - ); + jirafeau_fatal_error(t('CONF_SOLUTION_2')); } /** @@ -148,26 +62,26 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) { if (isset($_POST['step']) && isset($_POST['next'])) { switch ($_POST['step']) { - case 1: - 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['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 1: + 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['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; } } @@ -181,114 +95,112 @@ if (isset($_POST['next'])) { } switch ($current) { -case 1: -default: - ?>

+ ?> + id = "admin_password" size = "40" autocomplete = "new-password"/>

+ ?> + echo(empty($cfg['web_root']) ? jirafeau_default_web_root() : $cfg['web_root']); + ?>" size = "40" /> + ?> + ?>" size = "40" />
+ echo t('PREV_STEP'); ?>" />

+ ?>" />

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

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

'; - } else { - $cfg['installation_done'] = true; - jirafeau_export_cfg($cfg); - echo '

' . - t('JI_FONCTIONAL') . ':' . - '
' . - $cfg['web_root'].'

'; - } -break; + } else { + $cfg['installation_done'] = true; + jirafeau_export_cfg($cfg); + echo '

' . + t('JI_FONCTIONAL') . ':' . + '
' . + $cfg['web_root'].'

'; + } + break; } require(JIRAFEAU_ROOT . 'lib/template/footer.php');