X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/deeb1323362ec6750535865e1e18ca37fe7728fc..1a41ef82ac7e1a30134e471f73e9a8d0e204f2a6:/install.php?ds=inline
diff --git a/install.php b/install.php
index ae4bd99..4a554ab 100644
--- a/install.php
+++ b/install.php
@@ -17,58 +17,42 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see ' .
$path . '
' . $solution_str .
'
' . $mkdir_str2);
+ }
- foreach (array ('files', 'links', 'async', 'alias') as $subdir)
- {
+ foreach (array('files', 'links', 'async') as $subdir) {
$subpath = $path.$subdir;
- if (!jirafeau_mkdir ($subpath) || !jirafeau_is_writable ($subpath))
- return array ('has_error' => true,
+ if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
+ return array('has_error' => true,
'why' => $mkdir_str1 . '' .
$subpath . '
' . $solution_str .
'
' . $mkdir_str2);
+ }
}
- return array ('has_error' => false, 'why' => '');
+ return array('has_error' => false, 'why' => '');
}
-function
-jirafeau_add_ending_slash ($path)
+function jirafeau_add_ending_slash($path)
{
- return $path . ((substr ($path, -1) == '/') ? '' : '/');
+ return $path . ((substr($path, -1) == '/') ? '' : '/');
}
-if ($cfg['installation_done'] === true)
-{
+/**
+ * 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;
}
-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 ' .
+/**
+ * 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('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.') .
- '
' .
- 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.') .
- '
lib/config.local.php
file.')
+ );
}
-if (isset ($_POST['step']) && isset ($_POST['next']))
-{
- switch ($_POST['step'])
- {
+/**
+ * Run trough each installation step
+ **/
+
+if (isset($_POST['step']) && isset($_POST['next'])) {
+ switch ($_POST['step']) {
case 1:
- $cfg['lang'] = $_POST['lang'];
- jirafeau_export_cfg ($cfg);
+ 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['admin_password'] = hash('sha256', $_POST['admin_password']);
- jirafeau_export_cfg ($cfg);
+ $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 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);
+ $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)
-{
+switch ($current) {
case 1:
default:
- ?>