X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/9d3160e354918d84b84e6979cbd5215435ef3f5c..af7e43a4a3bbcb62912eabd75537480bf696b265:/install.php diff --git a/install.php b/install.php index 451ebe3..51cf7b8 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,18 +15,21 @@ * 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/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); -require (JIRAFEAU_ROOT . 'lib/config.original.php'); + +/** + * Prepend used functions + **/ function jirafeau_quoted ($str) @@ -67,9 +71,7 @@ jirafeau_export_cfg ($cfg) function jirafeau_mkdir ($path) { - if (!file_exists ($path) && !@mkdir ($path, 0755)) - return false; - return true; + return !(!file_exists ($path) && !@mkdir ($path, 0755)); } /** @@ -101,7 +103,7 @@ jirafeau_check_var_dir ($path) $path . '
' . $solution_str . '
' . $mkdir_str2); - foreach (array ('files', 'links', 'async') as $subdir) + foreach (array ('files', 'links', 'async', 'alias') as $subdir) { $subpath = $path.$subdir; @@ -121,42 +123,62 @@ jirafeau_add_ending_slash ($path) return $path . ((substr ($path, -1) == '/') ? '' : '/'); } -if ($cfg['installation_done'] === true) +function +jirafeau_fatal_error($errorText) { - header('Location: index.php'); + echo '

Error

' . $errorText . '

'; + require (JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } +/** + * Check installation + **/ + +// 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; +} + +/** + * Prepare installation process + **/ + +require (JIRAFEAU_ROOT . 'lib/template/header.php'); + +// does the local configuration file exist? if (!file_exists (JIRAFEAU_CFG)) { - /* We try to create an empty one. */ + // show an error if it is not possible to create the file if (!@touch (JIRAFEAU_CFG)) { - require (JIRAFEAU_ROOT . 'lib/template/header.php'); - echo '

' . - t('The local configuration file could not be created. Create a ' . + 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.') . - '

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

' . - 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.') . - '

'; - 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.') + ); } +/** + * Run trough each installation step + **/ + if (isset ($_POST['step']) && isset ($_POST['next'])) { switch ($_POST['step']) @@ -167,7 +189,7 @@ if (isset ($_POST['step']) && isset ($_POST['next'])) break; case 2: - $cfg['admin_password'] = $_POST['admin_password']; + $cfg['admin_password'] = hash('sha256', $_POST['admin_password']); jirafeau_export_cfg ($cfg); break; @@ -182,15 +204,10 @@ if (isset ($_POST['step']) && isset ($_POST['next'])) $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']); jirafeau_export_cfg ($cfg); break; - - default: break; } } -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/template/header.php'); - $current = 1; if (isset ($_POST['next'])) $current = $_POST['step'] + 1; @@ -235,7 +252,7 @@ default: "" />