X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/df31fed41e6f10218a99ece4a4f47571eea360f5..fab058b4ecffc3309c731c44befbd54bc9749567:/install.php
diff --git a/install.php b/install.php
index a5e5420..ed99b19 100644
--- a/install.php
+++ b/install.php
@@ -47,23 +47,13 @@ require(JIRAFEAU_ROOT . 'lib/template/header.php');
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.')
- );
+ jirafeau_fatal_error(t('CONF_SOLUTION'));
}
}
// is the local configuration writable?
if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
- 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.')
- );
+ jirafeau_fatal_error(t('CONF_SOLUTION_2'));
}
/**
@@ -72,26 +62,26 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
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;
+ 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;
}
}
@@ -105,117 +95,112 @@ if (isset($_POST['next'])) {
}
switch ($current) {
-case 1:
-default:
- ?>