X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/c447f2d7c18e5e89d83b420a8c706fbfa07c9b85..420be1d8b35ee5cd319662619365e091ef17e9f0:/install.php?ds=sidebyside diff --git a/install.php b/install.php index 2739bc8..2798e5a 100644 --- a/install.php +++ b/install.php @@ -26,82 +26,6 @@ require(JIRAFEAU_ROOT . 'lib/settings.php'); require(JIRAFEAU_ROOT . 'lib/functions.php'); require(JIRAFEAU_ROOT . 'lib/lang.php'); -/** - * Prepend used functions - **/ - -function jirafeau_quoted($str) -{ - return QUOTE . str_replace(QUOTE, "\'", $str) . QUOTE; -} - -function jirafeau_export_cfg($cfg) -{ - $content = '<?php' . NL; - $content .= '/* ' . t('This file was generated by the install process. ' . - 'You can edit it. Please see config.original.php to understand the ' . - 'configuration items.') . ' */' . NL; - $content .= '$cfg = ' . var_export($cfg, true) . ';'; - - $fileWrite = file_put_contents(JIRAFEAU_CFG, $content); - - if (false === $fileWrite) { - jirafeau_fatal_error(t('Can not write local configuration file')); - } -} - -function jirafeau_mkdir($path) -{ - return !(!file_exists($path) && !@mkdir($path, 0755)); -} - -/** - * Returns true whether the path is writable or we manage to make it - * so, which essentially is the same thing. - * @param $path is the file or directory to be tested. - * @return true if $path is writable. - */ -function jirafeau_is_writable($path) -{ - /* "@" gets rid of error messages. */ - return is_writable($path) || @chmod($path, 0777); -} - -function jirafeau_check_var_dir($path) -{ - $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 = t('Here is a solution') . ':'; - - if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) { - return array('has_error' => true, - 'why' => $mkdir_str1 . '<br /><code>' . - $path . '</code><br />' . $solution_str . - '<br />' . $mkdir_str2); - } - - foreach (array('files', 'links', 'async', 'alias') as $subdir) { - $subpath = $path.$subdir; - - if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) { - return array('has_error' => true, - 'why' => $mkdir_str1 . '<br /><code>' . - $subpath . '</code><br />' . $solution_str . - '<br />' . $mkdir_str2); - } - } - - return array('has_error' => false, 'why' => ''); -} - -function jirafeau_add_ending_slash($path) -{ - return $path . ((substr($path, -1) == '/') ? '' : '/'); -} - /** * Check installation **/ @@ -149,22 +73,21 @@ if (!is_writable(JIRAFEAU_CFG) && !@chmod(JIRAFEAU_CFG, '0666')) { if (isset($_POST['step']) && isset($_POST['next'])) { switch ($_POST['step']) { case 1: - $cfg['lang'] = $_POST['lang']; + if (strlen($_POST['admin_password'])) { + $cfg['admin_password'] = hash('sha256', $_POST['admin_password']); + } else { + $cfg['admin_password'] = ''; + } jirafeau_export_cfg($cfg); break; case 2: - $cfg['admin_password'] = hash('sha256', $_POST['admin_password']); - jirafeau_export_cfg($cfg); - break; - - case 3: $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']); $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']); jirafeau_export_cfg($cfg); break; - case 4: + case 3: $cfg['web_root'] = jirafeau_add_ending_slash($_POST['web_root']); $cfg['var_root'] = jirafeau_add_ending_slash($_POST['var_root']); jirafeau_export_cfg($cfg); @@ -184,51 +107,17 @@ if (isset($_POST['next'])) { switch ($current) { case 1: default: - ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') . - ' %d ' . t('out of') . ' %d', 1, 4); + ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') . + ' %d ' . t('OUT_OF') . ' %d', 1, 3); ?></h2> <div id = "install"> <form method="post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = - "step" value = "1" /><fieldset> <legend><?php echo t('Language'); + "step" value = "1" /><fieldset> <legend><?php + echo t('ADMIN_PSW'); ?></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 t('Choose the default language') . ':'; - ?></label></td> - <td class = "field"> - <select name = "lang" id = "select_lang"> - <?php foreach ($languages_list as $key => $item) { - echo '<option value="'.$key.'"'.($key == - $cfg['lang'] ? ' selected="selected"' - : '').'>'.$item.'</option>'.NL; - } - ?></select> - </td> - </tr> - <tr class = "nav"> - <td></td> - <td class = "nav next"><input type = "submit" name = "next" value = - "<?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); - ?></h2> <div id = "install"> <form method="post"> <input type = - "hidden" name = "jirafeau" value = - "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = - "step" value = "2" /><fieldset> <legend><?php - 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 interface or leave it empty ' . - 'to disable the interface.'); + "2"><?php echo t('ADMIN_INTERFACE_INFO'); ?></td> </tr> <tr> <td class = "label"><label for = "select_password" - ><?php echo t('Administration password') . ':'; + ><?php echo t('ADMIN_PSW') . ':'; ?></label></td> <td class = "field"><input type = "password" name = "admin_password" id = "admin_password" size = "40" /></td> @@ -238,41 +127,33 @@ case 2: <td class = "nav next"> <input type = "submit" class = "navleft" name = "previous" value = "<?php - echo t('Previous step'); ?>" /> + echo t('PREV_STEP'); ?>" /> <input type = "submit" name = "next" value = - "<?php echo t('Next step'); ?>" /></td> </tr> </table> + "<?php echo t('NEXT_STEP'); ?>" /></td> </tr> </table> </fieldset> </form> </div> <?php break; -case 3: - ?><h2><?php printf(t('Installation of Jirafeau') . ' - ' . t('step') . - ' %d ' . t('out of') . ' %d', 3, 4); +case 2: + ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') . + ' %d ' . t('OUT_OF') . ' %d', 2, 3); ?></h2> <div id = "install"> <form method="post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = "step" value = - "3" /><fieldset> <legend><?php echo t('Information'); + "2" /><fieldset> <legend><?php echo t('INFO'); ?></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 trailing slash!'); + "2"><?php echo t('BASE_ADDR_INFO'); ?></td> </tr> <tr> <td class = "label"><label for = "input_web_root" - ><?php echo t('Base address') . ':'; + ><?php echo t('BASE_ADDR') . ':'; ?></label></td> <td class = "field"><input type = "text" name = "web_root" id = "input_web_root" value = "<?php - echo(empty($cfg['web_root']) ? - 'http://' . $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__), - '', $_SERVER['REQUEST_URI']) : $cfg['web_root']); + echo(empty($cfg['web_root']) ? jirafeau_default_web_root() : $cfg['web_root']); ?>" size = "40" /></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 to this directory. Do not ' . - 'forget the trailing slash!'); + echo t('DATA_DIR_EXPLAINATION'); ?></td> </tr> <tr> <td class = "label"><label for = "input_var_root" - ><?php echo t('Data directory') . ':'; + ><?php echo t('DATA_DIR') . ':'; ?></label></td> <td class = "field"><input type = "text" name = "var_root" id = "input_var_root" value = "<?php @@ -291,30 +172,25 @@ case 3: ?>" size = "40" /></td> </tr> <tr> <td colspan = "2"><input type = "submit" class = "navleft" name = "previous" value = "<?php - echo t('Previous step'); ?>" /> - <input type = "submit" class = "navright" name = "next" value = " - <?php echo t('Next step'); ?>" /> + echo t('PREV_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(t('Installation of Jirafeau') . ' - ' . t('step') . - ' %d ' . t('out of') . ' %d', 4, 4); +case 3: + ?><h2><?php printf(t('JI_INSTALL') . ' - ' . t('STEP') . + ' %d ' . t('OUT_OF') . ' %d', 3, 3); ?></h2> <div id = "install"> <form method="post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = "step" value = - "4" /><fieldset> <legend><?php echo t('Finalisation'); + "3" /><fieldset> <legend><?php echo t('FINALIZATION'); ?></legend> <table> <tr> <td class = "info" colspan = - "2"><?php echo - t('Jirafeau is setting the website according to the configuration ' . - 'you provided.'); + "2"><?php echo t('SETTING_UP'); ?></td> </tr> <tr> <td class = "nav previous"><input type = - "submit" name = "previous" value = - " - <?php - echo t('Previous step'); + "submit" name = "previous" value = " <?php echo t('PREV_STEP'); ?>" /></td> <td></td> </tr> </table> </fieldset> </form> </div> <?php @@ -322,16 +198,16 @@ case 4: if ($err['has_error']) { echo '<div class="error"><p>'.$err['why'].'<br />'.NL; ?><form method="post"> <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION; ?>" /><input type = "hidden" name = - "step" value = "4" /><input type = "submit" name = + "step" value = "3" /><input type = "submit" name = "retry" value = - "<?php echo t('Retry this step'); ?>" /></form> + "<?php echo t('RETRY_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'] . '">' . + t('JI_FONCTIONAL') . ':' . + '<br /><a href="./">' . $cfg['web_root'].'</a></p></div>'; } break;