X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/d2c8c72cbde2e4813c7d32b3a118de99444d0273..351d2157ca6549dc831f8fcae5751b689d401c79:/install.php?ds=sidebyside diff --git a/install.php b/install.php old mode 100755 new mode 100644 index a3db15b..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) @@ -40,7 +42,7 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, '/* ' . t ('This file was generated by the install process. ' . - 'You can edit it. Please see config.php to understand the ' . + 'You can edit it. Please see config.original.php to understand the ' . 'configuration items.') . ' */' . NL); foreach ($cfg as $key => $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)); } /** @@ -83,9 +88,9 @@ function jirafeau_check_var_dir ($path) { $mkdir_str1 = t('The following directory could not be created') . ':'; - $mkdir_str2 = t('You should create this directory by hand.'); + $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 right to the web server on ' . + $write_str2 = t('You should give the write permission to the web server on ' . 'this directory.'); $solution_str = t('Here is a solution') . ':'; @@ -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. */ @@ -124,8 +135,8 @@ if (!file_exists (JIRAFEAU_CFG)) echo '

' . 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'); @@ -138,7 +149,7 @@ 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 right to the web server on the ' . + '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; } } @@ -223,7 +232,7 @@ default: "" />