X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/261af8ac3be2c4d9fbdae0f25c036440833d746c..9e4d7b5f220d21aa832f88efd784e8f464eb5384:/install.php?ds=sidebyside diff --git a/install.php b/install.php index c537bdd..df4f106 100644 --- a/install.php +++ b/install.php @@ -20,13 +20,16 @@ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); define ('NL', "\n"); define ('QUOTE', "'"); - -define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php'); +define ('JIRAFEAU_CFG', JIRAFEAU_ROOT . 'lib/config.local.php'); define ('JIRAFEAU_VAR_RAND_LENGTH', 15); +require (JIRAFEAU_ROOT . 'lib/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); -require (JIRAFEAU_ROOT . 'lib/config.original.php'); + +/** + * Prepend used functions + **/ function jirafeau_quoted ($str) @@ -37,32 +40,17 @@ jirafeau_quoted ($str) 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); + 'configuration items.') . ' */' . NL; + $content .= '$cfg = ' . var_export($cfg, true) . ';'; + + $fileWrite = file_put_contents(JIRAFEAU_CFG, $content); + + if (false === $fileWrite) { + jirafeau_fatal_error(t('Can not write local configuration file')); } - /* No newline at the end of the file to be able to send headers. */ - fwrite ($handle, '?>'); - fclose ($handle); } function @@ -120,42 +108,62 @@ jirafeau_add_ending_slash ($path) return $path . ((substr ($path, -1) == '/') ? '' : '/'); } -if ($cfg['installation_done'] === true) +function +jirafeau_fatal_error($errorText) { - header('Location: index.php'); + echo '
' . $errorText . '
' .
- t('The local configuration file could not be created. Create a ' .
+ 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.')
+ );
}
+/**
+ * Run trough each installation step
+ **/
+
if (isset ($_POST['step']) && isset ($_POST['next']))
{
switch ($_POST['step'])
@@ -166,7 +174,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;
@@ -185,9 +193,6 @@ if (isset ($_POST['step']) && isset ($_POST['next']))
}
-require (JIRAFEAU_ROOT . 'lib/settings.php');
-require (JIRAFEAU_ROOT . 'lib/template/header.php');
-
$current = 1;
if (isset ($_POST['next']))
$current = $_POST['step'] + 1;
@@ -232,7 +237,7 @@ default:
"" />