X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/0d601dd942a8b709adf5812045afcdc5873706c8..6564589a47862c108fa27f7be51ddf9f52011e80:/install.php diff --git a/install.php b/install.php old mode 100755 new mode 100644 index 838d749..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> + * 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 @@ -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 - * 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"); @@ -23,8 +24,9 @@ define ('QUOTE', "'"); 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) @@ -39,8 +41,8 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, '<?php' . NL); fwrite ($handle, '/* ' . - _ ('This file was generated by the install process. ' . - 'You can edit it. Please see config.php to understand the ' . + t ('This file was generated by the install process. ' . + 'You can edit it. Please see config.original.php to understand the ' . '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)); + 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); @@ -61,9 +68,7 @@ jirafeau_export_cfg ($cfg) function jirafeau_mkdir ($path) { - if (!file_exists ($path) && !@mkdir ($path, 0755)) - return false; - return true; + return !(!file_exists ($path) && !@mkdir ($path, 0755)); } /** @@ -82,12 +87,12 @@ jirafeau_is_writable ($path) function jirafeau_check_var_dir ($path) { - $mkdir_str1 = _('The following directory could not be created') . ':'; - $mkdir_str2 = _('You should create this directory by hand.'); - $write_str1 = _('The following directory is not writable') . ':'; - $write_str2 = _('You should give the write right to the web server on ' . + $mkdir_str1 = t('The following directory could not be created') . ':'; + $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 permission to the web server on ' . 'this directory.'); - $solution_str = _('Here is a solution') . ':'; + $solution_str = t('Here is a solution') . ':'; if (!jirafeau_mkdir ($path) || !jirafeau_is_writable ($path)) return array ('has_error' => true, @@ -95,7 +100,7 @@ jirafeau_check_var_dir ($path) $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; @@ -115,6 +120,12 @@ jirafeau_add_ending_slash ($path) 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. */ @@ -122,10 +133,10 @@ if (!file_exists (JIRAFEAU_CFG)) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '<div class="error"><p>' . - _('The local configuration file could not be created. Create a ' . + 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'); @@ -137,8 +148,8 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666')) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '<div class="error"><p>' . - _('The local configuration is not writable by the web server. ' . - 'Give the write right to the web server on the ' . + t('The local configuration is not writable by the web server. ' . + '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'); @@ -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; - - default: break; } } @@ -191,20 +200,20 @@ switch ($current) { case 1: default: - ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') . - ' %d ' . _('out of') . ' %d', 1, 4); + ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') . + ' %d ' . t('out of') . ' %d', 1, 4); ?></h2> <div id = "install"> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = - "step" value = "1" /><fieldset> <legend><?php echo _('Language'); + "step" value = "1" /><fieldset> <legend><?php echo t('Language'); ?></legend> <table> <tr> <td class = "info" colspan = "2"><?php echo - _ + t ('Jirafeau is internationalised. Choose a specific langage or ' . 'choose Automatic (langage is provided by user\'s browser).'); ?></td> </tr> <tr> <td class = "label"><label for = "select_lang" - ><?php echo _('Choose the default language') . ':'; + ><?php echo t('Choose the default language') . ':'; ?></label></td> <td class = "field"> <select name = "lang" id = "select_lang"> @@ -220,55 +229,59 @@ default: <tr class = "nav"> <td></td> <td class = "nav next"><input type = "submit" name = "next" value = - "<?php echo _('Next step'); ?>" /></td> </tr> </table> + "<?php echo t('Next step'); ?>" /></td> </tr> </table> </fieldset> </form> </div> <?php break; case 2: - ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') . - ' %d ' . _('out of') . ' %d', 2, 4); + ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') . + ' %d ' . t('out of') . ' %d', 2, 4); ?></h2> <div id = "install"> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = "step" value = "2" /><fieldset> <legend><?php - echo _('Administration password'); + echo t('Administration password'); ?></legend> <table> <tr> <td class = "info" colspan = "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 _('Administration password') . ':'; + ><?php echo t('Administration password') . ':'; ?></label></td> <td class = "field"><input type = "password" name = "admin_password" id = "admin_password" size = "40" /></td> </tr> <tr class = "nav"> <td></td> - <td class = "nav next"><input type = "submit" name = "next" value = - "<?php echo _('Next step'); ?>" /></td> </tr> </table> + <td class = "nav next"> + <input type = "submit" + class = "navleft" name = "previous" value = "<?php + echo t('Previous step'); ?>" /> + <input type = "submit" name = "next" value = + "<?php echo t('Next step'); ?>" /></td> </tr> </table> </fieldset> </form> </div> <?php break; case 3: - ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') . - ' %d ' . _('out of') . ' %d', 3, 4); + ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') . + ' %d ' . t('out of') . ' %d', 3, 4); ?></h2> <div id = "install"> <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" /><fieldset> <legend><?php echo _('Information'); + "3" /><fieldset> <legend><?php echo t('Information'); ?></legend> <table> <tr> <td class = "info" colspan = "2"><?php echo - _ + 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 _('Base address') . ':'; + ><?php echo t('Base address') . ':'; ?></label></td> <td class = "field"><input type = "text" name = "web_root" id = "input_web_root" value = "<?php @@ -277,12 +290,12 @@ case 3: '', $_SERVER['REQUEST_URI']) : $cfg['web_root']); ?>" size = "40" /></td> </tr> <tr> <td class = "info" colspan = "2"><?php - echo _('The data directory is where your files and information about' . + 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 _('Data directory') . ':'; + ><?php echo t('Data directory') . ':'; ?></label></td> <td class = "field"><input type = "text" name = "var_root" id = "input_var_root" value = "<?php @@ -299,32 +312,33 @@ case 3: else echo $cfg['var_root']; ?>" size = "40" /></td> - </tr> <tr> <td colspan = "2"> <input type = "submit" - class = "navright" name = "next" value = " - <?php echo _('Next step'); ?>" /><input type = "submit" + </tr> <tr> <td colspan = "2"><input type = "submit" class = "navleft" name = "previous" value = "<?php - echo _('Previous step'); ?>" /></td> </tr> </table> </fieldset> + echo t('Previous step'); ?>" /> + <input type = "submit" class = "navright" name = "next" value = " + <?php echo t('Next step'); ?>" /> + </td> </tr> </table> </fieldset> </form> </div> <?php break; case 4: - ?><h2><?php printf (_('Installation of Jirafeau') . ' - ' . _('step') . - ' %d ' . _('out of') . ' %d', 4, 4); + ?><h2><?php printf (t('Installation of Jirafeau') . ' - ' . t('step') . + ' %d ' . t('out of') . ' %d', 4, 4); ?></h2> <div id = "install"> <form action = "<?php echo basename(__FILE__); ?>" method = "post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = "step" value = - "4" /><fieldset> <legend><?php echo _('Finalisation'); + "4" /><fieldset> <legend><?php echo t('Finalisation'); ?></legend> <table> <tr> <td class = "info" colspan = "2"><?php echo - _ ('Jirafeau is setting the website according to the configuration ' . + t ('Jirafeau is setting the website according to the configuration ' . 'you provided.'); ?></td> </tr> <tr> <td class = "nav previous"><input type = "submit" name = "previous" value = " <?php - echo _('Previous step'); + echo t('Previous step'); ?>" /></td> <td></td> </tr> </table> </fieldset> </form> </div> <?php @@ -335,15 +349,17 @@ case 4: ?><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 _('Retry this step'); ?>" /></form> + "<?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>' . - _('Jirafeau is now fully operational') . ':' . + t('Jirafeau is now fully operational') . ':' . '<br /><a href="' . $cfg['web_root'] . '">' . $cfg['web_root'].'</a></p></div>'; }