X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/96707e02b8b24054e0827eaf169cc88504a1e78c..1016cc26d830c79ecdb2a8b3e06d7e5ca245d989:/install.php?ds=inline
diff --git a/install.php b/install.php
index 9e05b8c..ed99b19 100644
--- a/install.php
+++ b/install.php
@@ -26,89 +26,6 @@ require(JIRAFEAU_ROOT . 'lib/settings.php');
require(JIRAFEAU_ROOT . 'lib/functions.php');
require(JIRAFEAU_ROOT . 'lib/lang.php');
-/**
- * Prepend used functions
- **/
-
-function jirafeau_quoted($str)
-{
- return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE;
-}
-
-function jirafeau_export_cfg($cfg)
-{
- $content = ' 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);
- }
- }
-
- return array('has_error' => false, 'why' => '');
-}
-
-function jirafeau_add_ending_slash($path)
-{
- return $path . ((substr($path, -1) == '/') ? '' : '/');
-}
-
-function jirafeau_fatal_error($errorText)
-{
- echo '
' . $errorText . '
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'));
}
/**
@@ -155,27 +62,26 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) {
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;
+ 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;
}
}
@@ -189,159 +95,112 @@ if (isset($_POST['next'])) {
}
switch ($current) {
-case 1:
-default:
- ?>