X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/3cf8b39b331dd5f80c4ac674d13a6387d01d49b9..a995e194d8f5e997cfc1032389497a9f20b7d7e3:/install.php diff --git a/install.php b/install.php old mode 100644 new mode 100755 index 8a34477..c753c5b --- a/install.php +++ b/install.php @@ -23,6 +23,7 @@ define ('QUOTE', "'"); define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php'); define ('JIRAFEAU_VAR_RAND_LENGTH', 15); +require (JIRAFEAU_ROOT . 'lib/lang.php'); require (JIRAFEAU_ROOT . 'lib/config.php'); function @@ -38,7 +39,7 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, ' $item) @@ -81,12 +82,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 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, @@ -94,7 +95,7 @@ jirafeau_check_var_dir ($path) $path . '
' . $solution_str . '
' . $mkdir_str2); - foreach (array ('files', 'links') as $subdir) + foreach (array ('files', 'links', 'async') as $subdir) { $subpath = $path.$subdir; @@ -121,7 +122,7 @@ if (!file_exists (JIRAFEAU_CFG)) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

' . - _('The local configuration file could not be created. Create a ' . + t('The local configuration file could not be created. Create a ' . 'lib/config.local.php file and give the write ' . 'right to the web server (preferred solution), or give the ' . 'write right to the web server on the lib ' . @@ -136,7 +137,7 @@ if (!is_writable (JIRAFEAU_CFG) && !@chmod (JIRAFEAU_CFG, '0666')) { require (JIRAFEAU_ROOT . 'lib/template/header.php'); echo '

' . - _('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 ' . 'lib/config.local.php file.') . '

'; @@ -154,6 +155,17 @@ if (isset ($_POST['step']) && isset ($_POST['next'])) break; case 2: + $cfg['admin_password'] = $_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: $cfg['web_root'] = jirafeau_add_ending_slash ($_POST['web_root']); $cfg['var_root'] = jirafeau_add_ending_slash ($_POST['var_root']); jirafeau_export_cfg ($cfg); @@ -177,123 +189,171 @@ else if (isset ($_POST['retry'])) switch ($current) { -case 3: - ?>

-
-

'.$err['why'].'
'.NL; - ?>

" />" />
-
'; - } - else + t + ('Jirafeau is internationalised. Choose a specific langage or ' . + 'choose Automatic (langage is provided by user\'s browser).'); + ?> + + + + + + + " /> +

" method = "post"> " />
+ + + + +
+

- - - -
+ + + 'English', 'fr_FR.UTF-8' => 'Français'); - ?>

- +
-
+ '.$item.''.NL; + echo '

'.$err['why'].'
'.NL; + ?>

" />" />
+
'; } - ?> - - - - - " /> -

' . + t('Jirafeau is now fully operational') . ':' . + '
' . + $cfg['web_root'].'

'; + } +break; } - require (JIRAFEAU_ROOT . 'lib/template/footer.php'); ?>