X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/c147db2590b6add287eac571b1ce751be734b2ea..e7ca00035309ca757f2be9dddf37b0f66d66c2b6:/install.php?ds=sidebyside diff --git a/install.php b/install.php index 2d7afd9..6dbefb5 100644 --- a/install.php +++ b/install.php @@ -17,103 +17,14 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -define ('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php'); -define ('JIRAFEAU_VAR_RAND_LENGTH', 15); +define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php'); +define('JIRAFEAU_VAR_RAND_LENGTH', 15); -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; -} +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); /** * Check installation @@ -121,253 +32,175 @@ jirafeau_fatal_error($errorText) // Is the installation process done already? // Then there is nothing to do here → redirect to the main page. -if ($cfg['installation_done'] === true) -{ - header('Location: index.php'); - exit; +if ($cfg['installation_done'] === true) { + header('Location: index.php'); + exit; } /** * Prepare installation process **/ -require (JIRAFEAU_ROOT . 'lib/template/header.php'); +require(JIRAFEAU_ROOT . 'lib/template/header.php'); // does the local configuration file exist? -if (!file_exists (JIRAFEAU_CFG)) -{ +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.') - ); + if (!@touch(JIRAFEAU_CFG)) { + 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.') - ); +if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) { + jirafeau_fatal_error(t('CONF_SOLUTION_2')); } /** * Run trough each installation step **/ -if (isset ($_POST['step']) && isset ($_POST['next'])) -{ - switch ($_POST['step']) - { +if (isset($_POST['step']) && isset($_POST['next'])) { + switch ($_POST['step']) { case 1: - $cfg['lang'] = $_POST['lang']; - jirafeau_export_cfg ($cfg); + 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); + $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 4: - $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']); - $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']); - jirafeau_export_cfg ($cfg); + $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; } - } $current = 1; -if (isset ($_POST['next'])) +if (isset($_POST['next'])) { $current = $_POST['step'] + 1; -else if (isset ($_POST['previous'])) +} elseif (isset($_POST['previous'])) { $current = $_POST['step'] - 1; -else if (isset ($_POST['retry'])) +} elseif (isset($_POST['retry'])) { $current = $_POST['step']; +} -switch ($current) -{ +switch ($current) { case 1: default: - ?>

" method = "post">

- - - - -
- -
-

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

" method = "post">

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

" method = "post">

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

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

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

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

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