/*
* 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
* 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 <https://www.gnu.org/licenses/>.
*/
define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
define ('NL', "\n");
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/config.php');
+require (JIRAFEAU_ROOT . 'lib/config.original.php');
function
jirafeau_quoted ($str)
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)
{
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);
function
jirafeau_mkdir ($path)
{
- if (!file_exists ($path) && !@mkdir ($path, 0755))
- return false;
- return true;
+ return !(!file_exists ($path) && !@mkdir ($path, 0755));
}
/**
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') . ':';
$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;
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. */
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');
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');
break;
case 2:
- $cfg['admin_password'] = $_POST['admin_password'];
+ $cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
jirafeau_export_cfg ($cfg);
break;
$cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']);
jirafeau_export_cfg ($cfg);
break;
-
- default: break;
}
}
"<?php echo t('Next step'); ?>" /></td> </tr> </table>
</fieldset> </form> </div> <?php
break;
-
+
case 2:
?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') .
' %d ' . t('out of') . ' %d', 2, 4);
"2"><?php echo
t
('Jirafeau has an administration interface (through admin.php). ' .
- 'You can set a password to access the intercace or let it be empty ' .
+ 'You can set a password to access the interface or leave it empty ' .
'to disable the interface.');
?></td> </tr> <tr> <td class = "label"><label for = "select_password"
><?php echo t('Administration password') . ':';
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 ending slash!');
+ '"http://www.example.com/". Do not forget the trailing slash!');
?></td> </tr> <tr> <td class = "label"><label for = "input_web_root"
><?php echo t('Base address') . ':';
?></label></td>
</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 ending slash!');
+ 'site, or at least restrict the access to this directory. Do not ' .
+ 'forget the trailing slash!');
?></td> </tr> <tr> <td class = "label"><label for = "input_var_root"
><?php echo t('Data directory') . ':';
?></label></td>
}
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'] . '">' .
git.p6c8.net / jirafeau_project.git / blobdiff