X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/1f29ee2fe4477d9f01a40cc519dded5621d5d452..852f1941bf2fab3e0f524bc44b0e285ebfc33311:/install.php
diff --git a/install.php b/install.php
index 958aa1e..ed99b19 100644
--- a/install.php
+++ b/install.php
@@ -17,354 +17,190 @@
* 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 ('NL', "\n");
-define ('QUOTE', "'");
+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/functions.php');
-require (JIRAFEAU_ROOT . 'lib/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.original.php');
-
-function
-jirafeau_quoted ($str)
-{
- return QUOTE . str_replace (QUOTE, "\'", $str) . QUOTE;
-}
-
-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 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);
- }
- /* No newline at the end of the file to be able to send headers. */
- fwrite ($handle, '?>');
- fclose ($handle);
-}
-
-function
-jirafeau_mkdir ($path)
-{
- return !(!file_exists ($path) && !@mkdir ($path, 0755));
-}
+require(JIRAFEAU_ROOT . 'lib/settings.php');
+require(JIRAFEAU_ROOT . 'lib/functions.php');
+require(JIRAFEAU_ROOT . 'lib/lang.php');
/**
- * 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)
-{
- /* "@" gets rid of error messages. */
- return is_writable ($path) || @chmod ($path, 0777);
-}
-
-function
-jirafeau_check_var_dir ($path)
-{
- $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 = t('Here is a solution') . ':';
-
- if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path))
- return array ('has_error' => 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);
- }
+ * Check installation
+ **/
- return array ('has_error' => false, 'why' => '');
-}
-
-function
-jirafeau_add_ending_slash ($path)
-{
- return $path . ((substr ($path, -1) == '/') ? '' : '/');
-}
-
-if ($cfg['installation_done'] === 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;
}
-if (!file_exists (JIRAFEAU_CFG))
-{
- /* We try to create an empty one. */
- if (!@touch (JIRAFEAU_CFG))
- {
- require (JIRAFEAU_ROOT . 'lib/template/header.php');
- echo '
' .
- 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;
+/**
+ * Prepare installation process
+ **/
+
+require(JIRAFEAU_ROOT . 'lib/template/header.php');
+
+// 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('CONF_SOLUTION'));
}
}
-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;
+// is the local configuration writable?
+if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
+ jirafeau_fatal_error(t('CONF_SOLUTION_2'));
}
-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
- switch ($_POST['step'])
- {
- case 1:
- $cfg['lang'] = $_POST['lang'];
- jirafeau_export_cfg ($cfg);
- break;
-
- case 2:
- $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
- 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);
- break;
+/**
+ * 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']))
+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)
-{
-case 1:
-default:
- ?>