diff --git a/install.php b/install.php
index 584255f..5fd57e5 100644
--- a/install.php
+++ b/install.php
@@ -39,12 +39,17 @@
// Select Monstra language
if (Request::get('language')) {
+ if (Request::get('action') && Request::get('action') == 'install') {
+ $action = '?action=install';
+ } else {
+ $action = '';
+ }
if (in_array(Request::get('language'), $languages_array)) {
if (Option::update('language', Request::get('language'))) {
- Request::redirect($site_url);
+ Request::redirect($site_url.$action);
}
} else {
- Request::redirect($site_url);
+ Request::redirect($site_url.$action);
}
}
@@ -105,6 +110,8 @@
// Installation done :)
header("location: index.php?install=done");
+ } else {
+ Notification::setNow('errors', $errors);
}
}
?>
@@ -119,6 +126,7 @@
+
-
-
+
+
+
+
-

+
-
-
-
-
+
'.__('PHP 5.2 or greater is required', 'system').'';
+ echo '- '.__('PHP 5.2 or greater is required', 'system').'
';
} else {
- echo '- '.__('PHP Version', 'system').' '.PHP_VERSION.'
';
+ echo '- '.__('PHP Version', 'system').' '.PHP_VERSION.'
';
}
if (in_array('SimpleXML', $php_modules)) {
- echo '- '.__('Module SimpleXML is installed', 'system').'
';
+ echo '- '.__('Module SimpleXML is installed', 'system').'
';
} else {
- echo '- '.__('SimpleXML module is required', 'system').'
';
+ echo '- '.__('SimpleXML module is required', 'system').'
';
}
if (in_array('dom', $php_modules)) {
- echo '- '.__('Module DOM is installed', 'system').'
';
+ echo '- '.__('Module DOM is installed', 'system').'
';
} else {
- echo '- '.__('Module DOM is required', 'system').'
';
+ echo '- '.__('Module DOM is required', 'system').'
';
}
if (function_exists('apache_get_modules')) {
if ( ! in_array('mod_rewrite',apache_get_modules())) {
- echo '- '.__('Apache Mod Rewrite is required', 'system').'
';
+ echo '- '.__('Apache Mod Rewrite is required', 'system').'
';
} else {
- echo '- '.__('Module Mod Rewrite is installed', 'system').'
';
+ echo '- '.__('Module Mod Rewrite is installed', 'system').'
';
}
} else {
- echo '- '.__('Module Mod Rewrite is installed', 'system').'
';
+ echo '- '.__('Module Mod Rewrite is installed', 'system').'
';
}
foreach ($dir_array as $dir) {
if (is_writable($dir.'/')) {
- echo '- '.__('Directory: :dir writable', 'system', array(':dir' => $dir)).'
';
+ echo '- '.__('Directory: :dir writable', 'system', array(':dir' => $dir)).'
';
} else {
- echo '- '.__('Directory: :dir not writable', 'system', array(':dir' => $dir)).'
';
+ echo '- '.__('Directory: :dir not writable', 'system', array(':dir' => $dir)).'
';
}
}
if (is_writable(__FILE__)) {
- echo '- '.__('Install script writable', 'system').'
';
+ echo '- '.__('Install script writable', 'system').'
';
} else {
- echo '- '.__('Install script not writable', 'system').'
';
+ echo '- '.__('Install script not writable', 'system').'
';
}
if (is_writable('sitemap.xml')) {
- echo '- '.__('Sitemap file writable', 'system').'
';
+ echo '- '.__('Sitemap file writable', 'system').'
';
} else {
- echo '- '.__('Sitemap file not writable', 'system').'
';
+ echo '- '.__('Sitemap file not writable', 'system').'
';
}
if (is_writable('.htaccess')) {
- echo '- '.__('Main .htaccess file writable', 'system').'
';
+ echo '- '.__('Main .htaccess file writable', 'system').'
';
} else {
- echo '- '.__('Main .htaccess file not writable', 'system').'
';
+ echo '- '.__('Main .htaccess file not writable', 'system').'
';
}
if (isset($errors['sitename'])) echo '- '.$errors['sitename'].'
';
@@ -472,16 +518,24 @@
if (isset($errors['email_valid'])) echo '- '.$errors['email_valid'].'
';
?>
+
Continue
-