X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/6819d5cce7e781a81d04ef61c1c7aeff533f14d2..6d4142df4e30e1f46cfa5b377bf2db0323e59479:/install.php diff --git a/install.php b/install.php old mode 100755 new mode 100644 index 8c39dd0..78680f8 --- a/install.php +++ b/install.php @@ -52,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); @@ -86,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') . ':'; @@ -98,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', 'alias') as $subdir) { $subpath = $path.$subdir; @@ -118,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,26 +136,21 @@ 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.') . '

'; 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'); @@ -245,7 +249,7 @@ case 2: "2">