git.p6c8.net
/
jirafeau_mojo42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo in lib/settings.php
[jirafeau_mojo42.git]
/
install.php
diff --git
a/install.php
b/install.php
old mode 100755
(executable)
new mode 100644
(file)
index
c753c5b
..
41b25fc
--- 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);
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/lang.php');
-require (JIRAFEAU_ROOT . 'lib/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.
original.
php');
function
jirafeau_quoted ($str)
function
jirafeau_quoted ($str)
@@
-40,7
+41,7
@@
jirafeau_export_cfg ($cfg)
fwrite ($handle,
'/* ' .
t ('This file was generated by the install process. ' .
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)
{
'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));
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);
else
fwrite ($handle, 'null');
fwrite ($handle, ';'.NL);
@@
-115,6
+121,12
@@
jirafeau_add_ending_slash ($path)
return $path . ((substr ($path, -1) == '/') ? '' : '/');
}
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. */
if (!file_exists (JIRAFEAU_CFG))
{
/* We try to create an empty one. */
@@
-347,6
+359,9
@@
case 4:
}
else
{
}
else
{
+ $cfg['style'] = 'courgette';
+ $cfg['installation_done'] = true;
+ jirafeau_export_cfg ($cfg);
echo '<div class="message"><p>' .
t('Jirafeau is now fully operational') . ':' .
'<br /><a href="' . $cfg['web_root'] . '">' .
echo '<div class="message"><p>' .
t('Jirafeau is now fully operational') . ':' .
'<br /><a href="' . $cfg['web_root'] . '">' .
patrick-canterino.de