git.p6c8.net
/
jirafeau.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media/industrial: fix theme
[jirafeau.git]
/
install.php
diff --git
a/install.php
b/install.php
old mode 100755
(executable)
new mode 100644
(file)
index
8c39dd0
..
41b25fc
--- 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);
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);
@@
-98,7
+101,7
@@
jirafeau_check_var_dir ($path)
$path . '</code><br />' . $solution_str .
'<br />' . $mkdir_str2);
$path . '</code><br />' . $solution_str .
'<br />' . $mkdir_str2);
- foreach (array ('files', 'links', 'async'
, 'block'
) as $subdir)
+ foreach (array ('files', 'links', 'async') as $subdir)
{
$subpath = $path.$subdir;
{
$subpath = $path.$subdir;
@@
-118,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. */
@@
-135,11
+144,6
@@
if (!file_exists (JIRAFEAU_CFG))
exit;
}
}
exit;
}
}
-else
-{
- header('Location: index.php');
- exit;
-}
if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
{
if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
{
@@
-355,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