X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/0e5cca951eafa6193153f171b89a3bbf255152ef..4f9997a1d5ecf5ae89ca522d4d095116057c7076:/install.php diff --git a/install.php b/install.php old mode 100755 new mode 100644 index 87eaf60..f83faf0 --- a/install.php +++ b/install.php @@ -23,6 +23,7 @@ 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.original.php'); @@ -51,6 +52,9 @@ jirafeau_export_cfg ($cfg) 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); @@ -87,7 +91,7 @@ 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.'); $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') . ':'; @@ -97,7 +101,7 @@ jirafeau_check_var_dir ($path) $path . '
' . $solution_str . '
' . $mkdir_str2); - foreach (array ('files', 'links', 'async', 'block') as $subdir) + foreach (array ('files', 'links', 'async') as $subdir) { $subpath = $path.$subdir; @@ -117,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. */ @@ -127,25 +137,20 @@ if (!file_exists (JIRAFEAU_CFG)) 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 ' . + 'write permission to the web server on the lib ' . 'directory.') . '

'; require (JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } } -else -{ - header('Location: index.php'); - exit; -} if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666')) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

' . 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.') . '

'; require (JIRAFEAU_ROOT . 'lib/template/footer.php'); @@ -354,6 +359,8 @@ case 4: } else { + $cfg['installation_done'] = true; + jirafeau_export_cfg ($cfg); echo '

' . t('Jirafeau is now fully operational') . ':' . '
' .