Index: branches/5.0.x/core/install.php
===================================================================
diff -u -r12204 -r12277
--- branches/5.0.x/core/install.php	(.../install.php)	(revision 12204)
+++ branches/5.0.x/core/install.php	(.../install.php)	(revision 12277)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 12204 2009-08-06 01:33:26Z dmitrya $
+* @version	$Id: install.php 12277 2009-08-12 14:15:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,12 +68,12 @@
 		 * @var Array
 		 */
 		var $steps = Array (
-			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
-			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
+			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
+			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
 			'already_installed'	=>	Array ('check_paths', 'install_setup'),
 
 			'upgrade'			=>	Array ('check_paths', 'install_setup', 'upgrade_modules', 'security', 'finish'),
-			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', 'download_license', 'select_domain', 'security', 'finish'),
+			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', /*'download_license',*/ 'select_domain', 'security', 'finish'),
 			'db_reconfig'		=>	Array ('check_paths', 'install_setup', 'db_reconfig', 'security', 'finish'),
 			'fix_paths'			=>	Array ('check_paths', 'install_setup', 'fix_paths', 'security', 'finish'),
 		);
@@ -83,7 +83,7 @@
 		 *
 		 * @var Array
 		 */
-		var $skipLoginSteps = Array ('check_paths', 'select_license', 'download_license', 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish', -1);
+		var $skipLoginSteps = Array ('check_paths', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish', -1);
 
 		/**
 		 * Steps, on which kApplication should not be initialized, because of missing correct db table structure
@@ -422,12 +422,23 @@
 					unlink(WRITEABLE . '/install_check.php');
 					$execute_check = ($output !== 'OK');
 
-					if (!$write_check || !$execute_check) {
+					$directive_check = true;
+					$ini_vars = Array ('register_globals' => false, 'open_basedir' => true, 'allow_url_fopen' => false);
+					foreach ($ini_vars as $var_name => $var_value) {
+						$current_value = ini_get($var_name);
+
+						if (($var_value && !$current_value) || (!$var_value && $current_value)) {
+							$directive_check = false;
+							break;
+						}
+					}
+
+					if (!$write_check || !$execute_check || !$directive_check) {
 						$this->errorMessage = true;
 					}
-					else {
+					/*else {
 						$this->currentStep = $this->GetNextStep();
-					}
+					}*/
 					break;
 			}