X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/0d601dd942a8b709adf5812045afcdc5873706c8..d148eb80ff7a0ac0b18e501ff90445e070601ab1:/install.php diff --git a/install.php b/install.php old mode 100755 new mode 100644 index 838d749..ae4bd99 --- 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,7 +15,7 @@ * 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"); @@ -23,8 +24,9 @@ define ('QUOTE', "'"); define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php'); define ('JIRAFEAU_VAR_RAND_LENGTH', 15); +require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); function jirafeau_quoted ($str) @@ -39,8 +41,8 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, ' $item) { @@ -49,6 +51,11 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, ($item ? 'true' : 'false')); else if (is_string ($item)) fwrite ($handle, jirafeau_quoted ($item)); + else if (is_int ($item)) + fwrite ($handle, $item); + else if (is_array ($item)) + fwrite ($handle, str_replace(array("\n", "\r"), "", + var_export ($item, true))); else fwrite ($handle, 'null'); fwrite ($handle, ';'.NL); @@ -61,9 +68,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)); } /** @@ -82,12 +87,12 @@ jirafeau_is_writable ($path) 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 ' . + $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') . ':'; + $write_str2 = t('You should give the write permission to the web server on ' . 'this directory.'); - $solution_str = _('Here is a solution') . ':'; + $solution_str = t('Here is a solution') . ':'; if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path)) return array ('has_error' => true, @@ -95,7 +100,7 @@ jirafeau_check_var_dir ($path) $path . '
' . $solution_str . '
' . $mkdir_str2); - foreach (array ('files', 'links') as $subdir) + foreach (array ('files', 'links', 'async', 'alias') as $subdir) { $subpath = $path.$subdir; @@ -115,6 +120,12 @@ jirafeau_add_ending_slash ($path) return $path . ((substr ($path, -1) == '/') ? '' : '/'); } +if ($cfg['installation_done'] === true) +{ + header('Location: index.php'); + exit; +} + if (!file_exists (JIRAFEAU_CFG)) { /* We try to create an empty one. */ @@ -122,10 +133,10 @@ if (!file_exists (JIRAFEAU_CFG)) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

' . - _('The local configuration file could not be created. Create a ' . + t('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 ' . + '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'); @@ -137,8 +148,8 @@ 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 ' . + 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'); @@ -155,7 +166,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; @@ -170,8 +181,6 @@ if (isset ($_POST['step']) && isset ($_POST['next'])) $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']); jirafeau_export_cfg ($cfg); break; - - default: break; } } @@ -191,20 +200,20 @@ switch ($current) { case 1: default: - ?>

" />
+ "" />

-
" />
+ + + " />

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

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

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

'; }