X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/8446aee16b869be5235e55068ffeb76b163dac79..68892c7ee6ea5f3f30d1e5d1051cd7029b2cbd41:/install.php?ds=sidebyside
diff --git a/install.php b/install.php
old mode 100755
new mode 100644
index a3db15b..5226f1b
--- a/install.php
+++ b/install.php
@@ -23,8 +23,9 @@ define ('QUOTE', "'");
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.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
function
jirafeau_quoted ($str)
@@ -40,7 +41,7 @@ jirafeau_export_cfg ($cfg)
fwrite ($handle,
'/* ' .
t ('This file was generated by the install process. ' .
- 'You can edit it. Please see config.php to understand the ' .
+ 'You can edit it. Please see config.original.php to understand the ' .
'configuration items.') . ' */' . NL);
foreach ($cfg as $key => $item)
{
@@ -49,6 +50,11 @@ jirafeau_export_cfg ($cfg)
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);
@@ -83,9 +89,9 @@ function
jirafeau_check_var_dir ($path)
{
$mkdir_str1 = t('The following directory could not be created') . ':';
- $mkdir_str2 = t('You should create this directory by hand.');
+ $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 right to the web server on ' .
+ $write_str2 = t('You should give the write permission to the web server on ' .
'this directory.');
$solution_str = t('Here is a solution') . ':';
@@ -95,7 +101,7 @@ jirafeau_check_var_dir ($path)
$path . '
' . $solution_str .
'
' . $mkdir_str2);
- foreach (array ('files', 'links') as $subdir)
+ foreach (array ('files', 'links', 'async') as $subdir)
{
$subpath = $path.$subdir;
@@ -115,6 +121,12 @@ jirafeau_add_ending_slash ($path)
return $path . ((substr ($path, -1) == '/') ? '' : '/');
}
+if ($cfg['installation_done'] === true)
+{
+ header('Location: index.php');
+ exit;
+}
+
if (!file_exists (JIRAFEAU_CFG))
{
/* We try to create an empty one. */
@@ -124,8 +136,8 @@ if (!file_exists (JIRAFEAU_CFG))
echo '
' .
t('The local configuration file could not be created. Create a ' .
'lib/config.local.php
file and give the write ' .
- 'right to the web server (preferred solution), or give the ' .
- 'write right to the web server on the lib
' .
+ '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 right to the web server on the ' .
+ 'Give the write permission to the web server on the ' .
'lib/config.local.php
file.') .
'