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/courgette: fix borders in install
[jirafeau.git]
/
install.php
diff --git
a/install.php
b/install.php
index ca626aba3e915eec3703f1081fe9d1a957e8360b..5226f1bfdc48fb2616190184f96c1fbb1b403a5c 100644
(file)
--- 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);
@@
-86,9
+89,9
@@
function
jirafeau_check_var_dir ($path)
{
$mkdir_str1 = t('The following directory could not be created') . ':';
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_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') . ':';
'this directory.');
$solution_str = t('Here is a solution') . ':';
@@
-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;
@@
-133,8
+136,8
@@
if (!file_exists (JIRAFEAU_CFG))
echo '<div class="error"><p>' .
t('The local configuration file could not be created. Create a ' .
'<code>lib/config.local.php</code> file and give the write ' .
echo '<div class="error"><p>' .
t('The local configuration file could not be created. Create a ' .
'<code>lib/config.local.php</code> file and give the write ' .
- '
right
to the web server (preferred solution), or give the ' .
- 'write
right
to the web server on the <code>lib</code> ' .
+ '
permission
to the web server (preferred solution), or give the ' .
+ 'write
permission
to the web server on the <code>lib</code> ' .
'directory.') .
'</p></div>';
require (JIRAFEAU_ROOT . 'lib/template/footer.php');
'directory.') .
'</p></div>';
require (JIRAFEAU_ROOT . 'lib/template/footer.php');
@@
-147,7
+150,7
@@
if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666'))
require (JIRAFEAU_ROOT . 'lib/template/header.php');
echo '<div class="error"><p>' .
t('The local configuration is not writable by the web server. ' .
require (JIRAFEAU_ROOT . 'lib/template/header.php');
echo '<div class="error"><p>' .
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 ' .
'<code>lib/config.local.php</code> file.') .
'</p></div>';
require (JIRAFEAU_ROOT . 'lib/template/footer.php');
'<code>lib/config.local.php</code> file.') .
'</p></div>';
require (JIRAFEAU_ROOT . 'lib/template/footer.php');
@@
-171,7
+174,6
@@
if (isset ($_POST['step']) && isset ($_POST['next']))
case 3:
$cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
case 3:
$cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']);
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
- $cfg['installation_done'] = true;
jirafeau_export_cfg ($cfg);
break;
jirafeau_export_cfg ($cfg);
break;
@@
-247,7
+249,7
@@
case 2:
"2"><?php echo
t
('Jirafeau has an administration interface (through admin.php). ' .
"2"><?php echo
t
('Jirafeau has an administration interface (through admin.php). ' .
- 'You can set a password to access the inter
cace or let
it be empty ' .
+ 'You can set a password to access the inter
face or leave
it be empty ' .
'to disable the interface.');
?></td> </tr> <tr> <td class = "label"><label for = "select_password"
><?php echo t('Administration password') . ':';
'to disable the interface.');
?></td> </tr> <tr> <td class = "label"><label for = "select_password"
><?php echo t('Administration password') . ':';
@@
-280,7
+282,7
@@
case 3:
t
('The base address of Jirafeau is the first part of the URL, until ' .
'(and including) the last slash. For example: ' .
t
('The base address of Jirafeau is the first part of the URL, until ' .
'(and including) the last slash. For example: ' .
- '"http://www.example.com/". Do not forget the
end
ing slash!');
+ '"http://www.example.com/". Do not forget the
trail
ing slash!');
?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
><?php echo t('Base address') . ':';
?></label></td>
?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
><?php echo t('Base address') . ':';
?></label></td>
@@
-293,8
+295,8
@@
case 3:
</tr> <tr> <td class = "info" colspan = "2"><?php
echo t('The data directory is where your files and information about' .
' your files will be stored. You should put it outside your web ' .
</tr> <tr> <td class = "info" colspan = "2"><?php
echo t('The data directory is where your files and information about' .
' your files will be stored. You should put it outside your web ' .
- 'site, or at least restrict the access
of
this directory. Do not ' .
- 'forget the
end
ing slash!');
+ 'site, or at least restrict the access
to
this directory. Do not ' .
+ 'forget the
trail
ing slash!');
?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
><?php echo t('Data directory') . ':';
?></label></td>
?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
><?php echo t('Data directory') . ':';
?></label></td>
@@
-357,6
+359,8
@@
case 4:
}
else
{
}
else
{
+ $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