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, '<?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)
{
fwrite ($handle, ($item ? 'true' : 'false'));
else if (is_string ($item))
fwrite ($handle, jirafeau_quoted ($item));
+ else if (is_int ($item))
+ fwrite ($handle, $item);
else
fwrite ($handle, 'null');
fwrite ($handle, ';'.NL);
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 by hand.');
+ $write_str1 = t('The following directory is not writable') . ':';
+ $write_str2 = t('You should give the write right 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,
$path . '</code><br />' . $solution_str .
'<br />' . $mkdir_str2);
- foreach (array ('files', 'links') as $subdir)
+ foreach (array ('files', 'links', 'async', 'block') 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. */
{
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> ' .
{
require (JIRAFEAU_ROOT . 'lib/template/header.php');
echo '<div class="error"><p>' .
- _('The local configuration is not writable by the web server. ' .
+ t('The local configuration is not writable by the web server. ' .
'Give the write right to the web server on the ' .
'<code>lib/config.local.php</code> file.') .
'</p></div>';
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;
{
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">
<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 ' .
'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!');
?></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
'', $_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!');
?></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
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
?><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
{
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>';
}