X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=5a2b24bc7b9a65f9a87f5098c542e8aa8acd5a8a;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=9e8ce243c7fd25e8dc5a2eb1e1b632edeab4495d;hpb=5723ad849a1de48c2d914772106ddf903a70877d;p=fa-stable.git

diff --git a/install/index.php b/install/index.php
index 9e8ce243..5a2b24bc 100644
--- a/install/index.php
+++ b/install/index.php
@@ -23,14 +23,15 @@ 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) 
 {
 	global $path_to_root;
 	
-	echo '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" />
+	echo '<center><img src="'.$path_to_root.'/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" >
 		</center>';
 
 	$page = @$_POST['Page'] ? $_POST['Page'] : 1;
@@ -121,6 +122,9 @@ function install_connect_db() {
 	$db = db_create_db($conn);
 	if (!$db) {
 		display_error(_("Cannot connect to database. User or password is invalid or you have no permittions to create database."));
+	} else {
+		if (strncmp(db_get_version(), "5.6", 3) >= 0) 
+			db_query("SET sql_mode = ''");
 	}
 	return $db;
 }
@@ -140,10 +144,12 @@ function do_install() {
 		$db_connections = array (0=> array (
 		 'name' => $con['name'],
 		 'host' => $con['host'],
+		 'port' => $con['port'],
+		 'dbname' => $con['dbname'],
+		 'collation' => $con['collation'],
+		 'tbpref' => $table_prefix,
 		 'dbuser' => $con['dbuser'],
 		 'dbpassword' => $con['dbpassword'],
-		 'dbname' => $con['dbname'],
-		 'tbpref' => $table_prefix
 		));
 
 		$_SESSION['wa_current_user']->cur_con = 0;
@@ -151,7 +157,8 @@ 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'], 
+			'language' => $con['lang'], 
+			'password' => md5($con['pass']),
 			'user_id' => $con['admin']));
 
 		if (!copy($path_to_root. "/config.default.php", $path_to_root. "/config.php")) {
@@ -172,11 +179,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))
-			update_extensions(array());
 		return true;
 	}
 	return false;
@@ -185,12 +191,14 @@ function do_install() {
 if (!isset($_SESSION['inst_set']))  // default settings
 	$_SESSION['inst_set'] = array(
 		'host'=>'localhost', 
+		'port' => '', // 3306
 		'dbuser' => 'root',
 		'dbpassword' => '',
 		'username' => 'admin',
 		'tbpref' => '0_',
 		'admin' => 'admin',
-		'inst_lang' => 'C'
+		'inst_lang' => 'C',
+		'collation' => 'xx',
 	);
 
 if (!@$_POST['Tests'])
@@ -210,6 +218,10 @@ elseif (isset($_POST['db_test'])) {
 		display_error(_('Host name cannot be empty.'));
 		set_focus('host');
 	}
+	elseif ($_POST['port'] != '' && !is_numeric($_POST['port'])) {
+		display_error(_('Database port have to be numeric or empty.'));
+		set_focus('port');
+	}
 	elseif ($_POST['dbuser']=='') {
 		display_error(_('Database user name cannot be empty.'));
 		set_focus('dbuser');
@@ -221,12 +233,14 @@ elseif (isset($_POST['db_test'])) {
 	else {
 		$_SESSION['inst_set'] = array_merge($_SESSION['inst_set'], array(
 			'host' => $_POST['host'],
+			'port' => $_POST['port'],
 			'dbuser' => $_POST['dbuser'],
 			'dbpassword' => $_POST['dbpassword'],
 			'dbname' => $_POST['dbname'],
 			'tbpref' => $_POST['tbpref'] ? '0_' : '',
 			'sel_langs' => check_value('sel_langs'),
 			'sel_coas' => check_value('sel_coas'),
+			'collation' => $_POST['collation'],
 		));
 		if (install_connect_db()) {
 			$_POST['Page'] = check_value('sel_langs') ? 3 :
@@ -261,11 +275,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.'));
@@ -291,6 +305,7 @@ elseif (isset($_POST['set_admin'])) {
 			'pass' => $_POST['pass'],
 			'name' => $_POST['name'],
 			'admin' => $_POST['admin'],
+			'lang' => $_POST['lang']
 		));
 		if (do_install()) {
 			$_POST['Page'] = 6;
@@ -307,9 +322,6 @@ if (list_updated('inst_lang')) {
 start_form();
 	switch(@$_POST['Page']) {
 		default:
-//			include ('../install.html');
-//			submit_center('continue', _('Continue >>'));
-//			break;
 		case '1':
 			div_start('welcome');
 			subpage_title(_('System Diagnostics'));
@@ -336,16 +348,21 @@ start_form();
 			}
 			subpage_title(_('Database Server Settings'));
 			start_table(TABLESTYLE);
-			text_row_ex(_("Server Host:"), 'host', 30);
-			text_row_ex(_("Database User:"), 'dbuser', 30);
-			text_row_ex(_("Database Password:"), 'dbpassword', 30);
+			text_row_ex(_("Server Host:"), 'host', 30, 60);
+			text_row_ex(_("Server Port:"), 'port', 30, 60);
 			text_row_ex(_("Database Name:"), 'dbname', 30);
+			text_row_ex(_("Database User:"), 'dbuser', 30);
+			password_row(_("Database Password:"), 'dbpassword', '');
+			collations_list_row(_("Database Collation:"), 'collation');
 			yesno_list_row(_("Use '0_' Table Prefix:"), 'tbpref', 1, _('Yes'), _('No'), false);
 			check_row(_("Install Additional Language Packs from FA Repository:"), 'sel_langs');
 			check_row(_("Install Additional COAs from FA Repository:"), 'sel_coas');
 			end_table(1);
-			display_note(_('Use table prefix if you share selected database for more than one FA company.'));
+			display_note(_("Use database user/password with permissions to create new database, or use proper credentials for previously created empty database."));
+			display_note(_("Select collation you want to use. If you are unsure or you will use various languages, select unicode collation."));
+			display_note(_("Use table prefix if you share selected database for more than one FA company using the same collation."));
 			display_note(_("Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later."));
+			display_note(_("Set Only Port value if you cannot use the default port 3306."));
 			submit_center_first('back', _('<< Back'));
 			submit_center_last('db_test', _('Continue >>'));
 			break;
@@ -370,6 +387,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);
@@ -380,7 +402,7 @@ start_form();
 			languages_list_row(_("Select Default Language:"), 'lang');
 			end_table(1);
 			submit_center_first('back', _('<< Back'));
-			submit_center_last('set_admin', _('Continue >>'));
+			submit_center_last('set_admin', _('Install'), _('Start installation process'), 'default nonajax');
 			break;
 
 		case '6': // final screen
@@ -399,4 +421,3 @@ end_form(1);
 
 end_page(false, false, true);
 
-?>