git.p6c8.net
/
jirafeau_project.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add header for IE and compatibitity view
[jirafeau_project.git]
/
install.php
diff --git
a/install.php
b/install.php
old mode 100755
(executable)
new mode 100644
(file)
index
e54d44f
..
c537bdd
--- a/
install.php
+++ b/
install.php
@@
-2,6
+2,7
@@
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
+ * Copyright (C) 2015 Nicola Spanti (RyDroid) <dev@nicola-spanti.info>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@
-14,7
+15,7
@@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http
s
://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
@@
-23,8
+24,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
+42,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
+51,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);
@@
-61,9
+68,7
@@
jirafeau_export_cfg ($cfg)
function
jirafeau_mkdir ($path)
{
function
jirafeau_mkdir ($path)
{
- if (!file_exists ($path) && !@mkdir ($path, 0755))
- return false;
- return true;
+ return !(!file_exists ($path) && !@mkdir ($path, 0755));
}
/**
}
/**
@@
-83,9
+88,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') . ':';
@@
-95,7
+100,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') as $subdir)
+ foreach (array ('files', 'links'
, 'async', 'alias'
) as $subdir)
{
$subpath = $path.$subdir;
{
$subpath = $path.$subdir;
@@
-115,6
+120,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. */
@@
-124,8
+135,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');
@@
-138,7
+149,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');
@@
-170,8
+181,6
@@
if (isset ($_POST['step']) && isset ($_POST['next']))
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
-
- default: break;
}
}
}
}
@@
-237,7
+246,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
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') . ':';
@@
-270,7
+279,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>
@@
-283,8
+292,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>
@@
-340,13
+349,15
@@
case 4:
?><form action = "<?php echo basename(__FILE__); ?>" method =
"post"> <input type = "hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
?><form action = "<?php echo basename(__FILE__); ?>" method =
"post"> <input type = "hidden" name = "jirafeau" value =
"<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name =
- "step" value = "
3
" /><input type = "submit" name =
+ "step" value = "
4
" /><input type = "submit" name =
"retry" value =
"<?php echo t('Retry this step'); ?>" /></form>
<?php echo '</p></div>';
}
else
{
"retry" value =
"<?php echo t('Retry this step'); ?>" /></form>
<?php echo '</p></div>';
}
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