X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcreate_coy.php;h=0366e76c2a382de99b970a4e52f1957d7eb6ddb9;hb=11403450bbf64674332f64459670a1c06dd92265;hp=0ba1109047556c24d6d8068be1306c9bebd1a5d6;hpb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;p=fa-stable.git

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 0ba11090..0366e76c 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -25,20 +25,20 @@ $comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting', '
 //---------------------------------------------------------------------------------------------
 if (isset($_GET['selected_id']))
 {
-	$selected_id = $_GET['selected_id'];
+	$selected_id = (int)$_GET['selected_id'];
 }
 elseif (isset($_POST['selected_id']))
 {
-	$selected_id = $_POST['selected_id'];
+	$selected_id = (int)$_POST['selected_id'];
 }
 else
 	$selected_id = -1;
 
 //---------------------------------------------------------------------------------------------
 
-function check_data()
+function check_data($selected_id)
 {
-	global $db_connections, $tb_pref_counter, $selected_id;
+	global $db_connections, $tb_pref_counter;
 
 	if($selected_id != -1) {
 		if ($_POST['name'] == "")
@@ -88,13 +88,13 @@ function remove_connection($id) {
 }
 //---------------------------------------------------------------------------------------------
 
-function handle_submit()
+function handle_submit($selected_id)
 {
-	global $db_connections, $def_coy, $tb_pref_counter, $db,
-	    $comp_subdirs, $path_to_root, $selected_id;
+	global $Ajax, $db_connections, $def_coy, $tb_pref_counter, $db,
+	    $comp_subdirs, $path_to_root;
 
 	$error = false;
-	if (!check_data())
+	if (!check_data($selected_id))
 		return false;
 
 	if ($selected_id==-1)
@@ -106,7 +106,7 @@ function handle_submit()
 		$def_coy = $selected_id;
 
 	$db_connections[$selected_id]['name'] = $_POST['name'];
-	if($new) {
+	if ($new) {
 		$db_connections[$selected_id]['host'] = $_POST['host'];
 		$db_connections[$selected_id]['dbuser'] = $_POST['dbuser'];
 		$db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword'];
@@ -122,11 +122,13 @@ function handle_submit()
 			$db_connections[$selected_id]['tbpref'] = "";
 
 		$conn = $db_connections[$selected_id];
-		if (($db = db_create_db($conn)) == 0)
+		if (($db = db_create_db($conn)) === false)
 		{
 			display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
 			$error = true;
 		} else {
+			if (strncmp(db_get_version(), "5.6", 3) >= 0) 
+				db_query("SET sql_mode = ''");
 			if (!db_import($path_to_root.'/sql/'.get_post('coa'), $conn, $selected_id)) {
 				display_error(_('Cannot create new company due to bugs in sql file.'));
 				$error = true;
@@ -136,15 +138,16 @@ function handle_submit()
 				if (!isset($_POST['admpassword']) || $_POST['admpassword'] == "")
 					$_POST['admpassword'] = "password";
 				update_admin_password($conn, md5($_POST['admpassword']));
-			}	
+			}
 		}
-		set_global_connection();
 		if ($error) {
 			remove_connection($selected_id);
 			return false;
 		}
 	}
+
 	$error = write_config_db($new);
+	set_global_connection();
 	if ($error == -1)
 		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
 	else if ($error == -2)
@@ -163,16 +166,15 @@ function handle_submit()
 	$exts = get_company_extensions();
 	write_extensions($exts, $selected_id);
 	display_notification($new ? _('New company has been created.') : _('Company has been updated.'));
+	$Ajax->activate('_page_body');
 	return true;
 }
 
 //---------------------------------------------------------------------------------------------
 
-function handle_delete()
+function handle_delete($id)
 {
-	global $def_coy, $db_connections, $comp_subdirs, $path_to_root;
-
-	$id = $_GET['id'];
+	global $Ajax, $def_coy, $db_connections, $comp_subdirs, $path_to_root;
 
 	// First make sure all company directories from the one under removal are writable. 
 	// Without this after operation we end up with changed per-company owners!
@@ -211,6 +213,7 @@ function handle_delete()
 
 	if ($def_coy == $id)
 		$def_coy = 0;
+
 	$error = write_config_db();
 	if ($error == -1)
 		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
@@ -230,6 +233,7 @@ function handle_delete()
 		return;
 	}
 	display_notification(_("Selected company has been deleted"));
+	$Ajax->activate('_page_body');
 }
 
 //---------------------------------------------------------------------------------------------
@@ -238,7 +242,7 @@ function display_companies()
 {
 	global $def_coy, $db_connections;
 
-	$coyno = $_SESSION["wa_current_user"]->company;
+	$coyno = user_company();
 
 	echo "
 		<script language='javascript'>
@@ -333,7 +337,7 @@ function display_company_edit($selected_id)
 		$_POST['dbname']  = $conn['dbname'];
 	}
 
-	text_row_ex(_("Company"), 'name', 30);
+	text_row_ex(_("Company"), 'name', 50);
 
 	if ($selected_id == -1)
 	{
@@ -366,12 +370,12 @@ function display_company_edit($selected_id)
 //---------------------------------------------------------------------------------------------
 
 if (isset($_GET['c']) && $_GET['c'] == 'df') {
-	handle_delete();
+	handle_delete( (int)$_GET['id'] );
 	$selected_id = -1;
 }
 
 if (get_post('save')) {
-	if (handle_submit())
+	if (handle_submit($selected_id))
 		$selected_id = -1;
 }
 
@@ -386,4 +390,3 @@ display_company_edit($selected_id);
 //---------------------------------------------------------------------------------------------
 end_page();
 
-?>
\ No newline at end of file