X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=fc27f03038097a200e43db1cb57bf2ddf46d6ae2;hb=833c5906b0583f118cc1f059e257c39a7b8543cc;hp=ec6146e4d9d37aeede82474e0e3a9cbf1fd0381f;hpb=ab7a23a7b1c8ebc19b8301391ede254cd461327a;p=fa-stable.git

diff --git a/install/index.php b/install/index.php
index ec6146e4..fc27f030 100644
--- a/install/index.php
+++ b/install/index.php
@@ -23,7 +23,8 @@ include($path_to_root . "/includes/ui.inc");
 include($path_to_root . "/includes/system_tests.inc");
 include($path_to_root . "/admin/db/maintenance_db.inc");
 include($path_to_root . "/includes/packages.inc");
-@include($path_to_root . "/installed_extensions.php");
+if (file_exists($path_to_root . "/installed_extensions.php"))
+	include($path_to_root . "/installed_extensions.php");
 //-------------------------------------------------------------------------------------------------
 
 function subpage_title($txt) 
@@ -151,8 +152,9 @@ function do_install() {
 		update_company_prefs(array('coy_name'=>$con['name']));
 		$admin = get_user_by_login('admin');
 		update_user_prefs($admin['id'], array(
-			'language' => $_POST['lang'], 
-			'user_id' => $con['admin'], 
+			'language' => $con['lang'], 
+			'password' => md5($con['pass']),
+			'user_id' => $con['admin']));
 
 		if (!copy($path_to_root. "/config.default.php", $path_to_root. "/config.php")) {
 			display_error(_("Cannot save system configuration file 'config.php'."));
@@ -172,11 +174,10 @@ function do_install() {
 			return false;
 		}
 		// update default language
-		include_once($path_to_root . "/lang/installed_languages.inc");
+		if (file_exists($path_to_root . "/lang/installed_languages.inc"))
+			include_once($path_to_root . "/lang/installed_languages.inc");
 		$dflt_lang = $_POST['lang'];
 		write_lang();
-		if (!isset($installed_extensions))
-			write_extensions(array());
 		return true;
 	}
 	return false;
@@ -261,11 +262,11 @@ elseif(get_post('install_coas'))
 			$ret &= install_extension($package);
 		}
 	if ($ret) {
-		@include($path_to_root.'/installed_extensions.php');
+		if (file_exists($path_to_root . '/installed_extensions.php'))
+			include($path_to_root.'/installed_extensions.php');
 		$_POST['Page'] = 5;
 	}
-}
-elseif (isset($_POST['set_admin'])) {
+} elseif (isset($_POST['set_admin'])) {
 	// check company settings
 	if (get_post('name')=='') {
 		display_error(_('Company name cannot be empty.'));
@@ -336,7 +337,7 @@ start_form();
 			}
 			subpage_title(_('Database Server Settings'));
 			start_table(TABLESTYLE);
-			text_row_ex(_("Server Host:"), 'host', 30);
+			text_row_ex(_("Server Host:"), 'host', 30, 60);
 			text_row_ex(_("Database User:"), 'dbuser', 30);
 			text_row_ex(_("Database Password:"), 'dbpassword', 30);
 			text_row_ex(_("Database Name:"), 'dbname', 30);
@@ -370,6 +371,11 @@ start_form();
 					$_POST[$name] = $val;
 				set_focus('name');
 			}
+			if (!isset($installed_extensions)) {
+				$installed_extensions = array();
+				update_extensions($installed_extensions);
+			}
+
 			subpage_title(_('Company Settings'));
 			start_table(TABLESTYLE);
 			text_row_ex(_("Company Name:"), 'name', 30);
@@ -386,7 +392,8 @@ start_form();
 		case '6': // final screen
 			subpage_title(_('FrontAccounting ERP has been installed successsfully.'));
 			display_note(_('Please do not forget to remove install wizard folder.'));
-			$install_done = true;
+			session_unset();
+			session_destroy();
 			hyperlink_no_params($path_to_root.'/index.php', _('Click here to start.'));
 			break;