X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/e2d6cda643fb68b8f831ee7e4337d5e198cc83dd..ebbbd23cde04ecaf2166ace488824a4ca55239c9:/install.php?ds=sidebyside
diff --git a/install.php b/install.php
index b400988..b729be5 100644
--- a/install.php
+++ b/install.php
@@ -69,12 +69,12 @@ function jirafeau_is_writable($path)
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') . ':';
+ $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':';
+ $mkdir_str2 = t('MANUAL_CREATE');
+ $write_str1 = t('DIR_NOT_W') . ':';
$write_str2 = t('You should give the write permission to the web server on ' .
'this directory.');
- $solution_str = t('Here is a solution') . ':';
+ $solution_str = t('HERE_SOLUTION') . ':';
if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) {
return array('has_error' => true,
@@ -83,7 +83,7 @@ function jirafeau_check_var_dir($path)
'
' . $mkdir_str2);
}
- foreach (array('files', 'links', 'async', 'alias') as $subdir) {
+ foreach (array('files', 'links', 'async') as $subdir) {
$subpath = $path.$subdir;
if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) {
@@ -149,11 +149,6 @@ 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'];
- jirafeau_export_cfg($cfg);
- break;
-
- case 2:
if (strlen($_POST['admin_password'])) {
$cfg['admin_password'] = hash('sha256', $_POST['admin_password']);
} else {
@@ -162,13 +157,13 @@ if (isset($_POST['step']) && isset($_POST['next'])) {
jirafeau_export_cfg($cfg);
break;
- case 3:
+ case 2:
$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);
@@ -188,51 +183,17 @@ if (isset($_POST['next'])) {
switch ($current) {
case 1:
default:
- ?>
'.$err['why'].'
'.NL; ?>