X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/ba6f06965a4d9846e23d99a0e9f74b1361c18c40..refs/merge-requests/85/head:/install.php?ds=sidebyside diff --git a/install.php b/install.php index dfe094c..2798e5a 100644 --- a/install.php +++ b/install.php @@ -2,6 +2,7 @@ /* * Jirafeau, your web file repository * Copyright (C) 2008 Julien "axolotl" BERNARD + * Copyright (C) 2015 Nicola Spanti (RyDroid) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -14,303 +15,202 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ - define('JIRAFEAU_ROOT', dirname(__FILE__) . '/'); -define('NL', "\n"); -define('QUOTE', "'"); define('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php'); define('JIRAFEAU_VAR_RAND_LENGTH', 15); -require(JIRAFEAU_ROOT . 'lib/config.php'); - -function jirafeau_quoted($str) { - return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE; -} +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); -function jirafeau_export_cfg($cfg) { - $handle = fopen(JIRAFEAU_CFG, 'w'); - fwrite($handle, ' $item) { - fwrite($handle, '$cfg[' . jirafeau_quoted($key) . '] = '); - if(is_bool($item)) { - fwrite($handle, ($item ? 'true' : 'false')); - } else if(is_string($item)) { - fwrite($handle, jirafeau_quoted($item)); - } else { - fwrite($handle, 'null'); - } - fwrite($handle, ';' . NL); - } - fwrite($handle, '?>'); // no newline at the end of the file to be able to send headers - fclose($handle); -} +/** + * Check installation + **/ -function jirafeau_mkdir($path) { - if(!file_exists($path)) { - if(!@mkdir($path, 0755)) { - return false; - } - } - return true; +// 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; } /** - * Returns true whether the path is writable or we manage to make it - * so, which essentially is the same thing. - * @param $path is the file or directory to be tested. - * @return true if $path is writable. - */ -function jirafeau_is_writable($path) { - return is_writable($path) || @chmod($path, 0777); // "@" gets rid of error messages. -} - -function jirafeau_check_var_dir($path) { - $mkdir_str1 = _('The following directory could not be created:'); - $mkdir_str2 = _('You should create this directory by hand.'); - $write_str1 = _('The following directory is not writable:'); - $write_str2 = _('You should give the write right to the web server on this directory.'); - $solution_str = _('Here is a solution:'); - - if(!jirafeau_mkdir($path)) { - return array( - 'has_error' => true, - 'why' => $mkdir_str1 . '
' . $path . '
' . $solution_str . '
' . $mkdir_str2 - ); - } + * Prepare installation process + **/ - if(!jirafeau_is_writable($path)) { - return array( - 'has_error' => true, - 'why' => $write_str1 . '
' . $path . '
' . $solution_str . '
' . $write_str2 - ); - } - - foreach(array('files', 'links', 'trash') as $subdir) { - $subpath = $path . $subdir; - - if(!jirafeau_mkdir($subpath)) { - return array( - 'has_error' => true, - 'why' => $mkdir_str1 . '
' . $subpath . '
' . $solution_str . '
' . $mkdir_str2 - ); - } +require(JIRAFEAU_ROOT . 'lib/template/header.php'); - if(!jirafeau_is_writable($subpath)) { - return array( - 'has_error' => true, - 'why' => $write_str1 . '
' . $subpath . '
' . $solution_str . '
' . $write_str2 - ); +// does the local configuration file exist? +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.') + ); } - - } - - return array('has_error' => false, 'why' => ''); -} - -function jirafeau_add_ending_slash($path) { - return $path . ((substr($path, -1) == '/') ? '' : '/'); -} - -if(!file_exists(JIRAFEAU_CFG)) { - // we try to create an empty one - if(!@touch(JIRAFEAU_CFG)) { - require(JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

' . _('The local configuration file could not be created. Create a lib/config.local.php file and give the write right to the web server (preferred solution), or give the write right to the web server on the lib directory.') . '

'; - require(JIRAFEAU_ROOT . 'lib/template/footer.php'); - exit; - } } +// is the local configuration writable? if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) { - require(JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

' . _('The local configuration is not writable by the web server. Give the write right to the web server on the lib/config.local.php file.') . '

'; - require(JIRAFEAU_ROOT . 'lib/template/footer.php'); - exit; + 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(isset($_POST['step']) && isset($_POST['next'])) { - switch($_POST['step']) { - case 1: - $cfg['lang'] = $_POST['lang']; - 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; - - default: - // nothing to do - } - +/** + * Run trough each installation step + **/ + +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; + } } -require(JIRAFEAU_ROOT . 'lib/settings.php'); -require(JIRAFEAU_ROOT . 'lib/template/header.php'); - $current = 1; -if(isset($_POST['next'])) { - $current = $_POST['step'] + 1; -} else if(isset($_POST['previous'])) { - $current = $_POST['step'] - 1; -} else if(isset($_POST['retry'])) { - $current = $_POST['step']; +if (isset($_POST['next'])) { + $current = $_POST['step'] + 1; +} elseif (isset($_POST['previous'])) { + $current = $_POST['step'] - 1; +} elseif (isset($_POST['retry'])) { + $current = $_POST['step']; } -switch($current) { - case 3: -?> -

-
-
- - -
- - - - - - - - - -
-
-
-
- -

" />
+ + + + +
+ + " />
+

" />
+ + + +
+ " /> +
+

" />
+
+

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

- - - -
-'; + if ($err['has_error']) { + echo '

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

" />" />
+
'; } else { - echo '

' . _('Your website is now fully operational:') . '
' . $cfg['web_root'] . '

'; + $cfg['installation_done'] = true; + jirafeau_export_cfg($cfg); + echo '

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

'; } - break; - - case 2: -?> -

-
-
- - -
- - - - - - - - - - - - - - - - - - - -
- - -
-
-
-
- 'English', - 'fr_FR.UTF-8' => 'Français' - ); -?> -

-
-
- - -
- - - - - - - - - - - - - -
- -
-
-
-
-