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

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 21861a0f..0366e76c 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -25,40 +25,50 @@ $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 ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
-		return false;
-
-	foreach($db_connections as $id=>$con)
-	{
-	 if($id != $selected_id && $_POST['host'] == $con['host'] 
-	 	&& $_POST['dbname'] == $con['dbname'])
-	  	{
-			if ($_POST['tbpref'] == $con['tbpref'])
-			{
-				display_error(_("This database settings are already used by another company."));
-				return false;
-			}
-			if (($_POST['tbpref'] == 0) ^ ($con['tbpref'] == ''))
-			{
-				display_error(_("You cannot have table set without prefix together with prefixed sets in the same database."));
-				return false;
-			}
-	  	}
+	if($selected_id != -1) {
+		if ($_POST['name'] == "")
+		{
+			display_error(_("Database settings are not specified."));
+	 		return false;
+		}
+	} else {
+		if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
+		{
+			display_error(_("Database settings are not specified."));
+	 		return false;
+		}
+		foreach($db_connections as $id=>$con)
+		{
+		 if($id != $selected_id && $_POST['host'] == $con['host'] 
+		 	&& $_POST['dbname'] == $con['dbname'])
+	  		{
+				if ($_POST['tbpref'] == $con['tbpref'])
+				{
+					display_error(_("This database settings are already used by another company."));
+					return false;
+				}
+				if (($_POST['tbpref'] == 0) ^ ($con['tbpref'] == ''))
+				{
+					display_error(_("You cannot have table set without prefix together with prefixed sets in the same database."));
+					return false;
+				}
+		  	}
+		}
 	}
 	return true;
 }
@@ -78,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)
@@ -92,43 +102,52 @@ function handle_submit()
 
 	$new = !isset($db_connections[$selected_id]);
 
-	$db_connections[$selected_id]['name'] = $_POST['name'];
-	$db_connections[$selected_id]['host'] = $_POST['host'];
-	$db_connections[$selected_id]['dbuser'] = $_POST['dbuser'];
-	$db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword'];
-	$db_connections[$selected_id]['dbname'] = $_POST['dbname'];
-	if (is_numeric($_POST['tbpref']))
-	{
-		$db_connections[$selected_id]['tbpref'] = $_POST['tbpref'] == 1 ?
-		  $tb_pref_counter."_" : '';
-	}
-	else if ($_POST['tbpref'] != "")
-		$db_connections[$selected_id]['tbpref'] = $_POST['tbpref'];
-	else
-		$db_connections[$selected_id]['tbpref'] = "";
-
 	if ((bool)$_POST['def'] == true)
 		$def_coy = $selected_id;
 
-	$conn = $db_connections[$selected_id];
-	if (($db = db_create_db($conn)) == 0)
-	{
-		display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
-		$error = true;
-	} else {
-		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.'));
+	$db_connections[$selected_id]['name'] = $_POST['name'];
+	if ($new) {
+		$db_connections[$selected_id]['host'] = $_POST['host'];
+		$db_connections[$selected_id]['dbuser'] = $_POST['dbuser'];
+		$db_connections[$selected_id]['dbpassword'] = $_POST['dbpassword'];
+		$db_connections[$selected_id]['dbname'] = $_POST['dbname'];
+		if (is_numeric($_POST['tbpref']))
+		{
+			$db_connections[$selected_id]['tbpref'] = $_POST['tbpref'] == 1 ?
+			  $tb_pref_counter."_" : '';
+		}
+		else if ($_POST['tbpref'] != "")
+			$db_connections[$selected_id]['tbpref'] = $_POST['tbpref'];
+		else
+			$db_connections[$selected_id]['tbpref'] = "";
+
+		$conn = $db_connections[$selected_id];
+		if (($db = db_create_db($conn)) === false)
+		{
+			display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
 			$error = true;
-		} else
-			if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
+		} 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;
+			} 
+			else
+			{
+				if (!isset($_POST['admpassword']) || $_POST['admpassword'] == "")
+					$_POST['admpassword'] = "password";
 				update_admin_password($conn, md5($_POST['admpassword']));
+			}
+		}
+		if ($error) {
+			remove_connection($selected_id);
+			return false;
+		}
 	}
-	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)
@@ -147,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!
@@ -195,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");
@@ -214,6 +233,7 @@ function handle_delete()
 		return;
 	}
 	display_notification(_("Selected company has been deleted"));
+	$Ajax->activate('_page_body');
 }
 
 //---------------------------------------------------------------------------------------------
@@ -222,12 +242,12 @@ function display_companies()
 {
 	global $def_coy, $db_connections;
 
-	$coyno = $_SESSION["wa_current_user"]->company;
+	$coyno = user_company();
 
 	echo "
 		<script language='javascript'>
-		function deleteCompany(id) {
-			if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id))
+		function deleteCompany(id, name) {
+			if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
 				return
 			document.location.replace('create_coy.php?c=df&id='+id)
 		}
@@ -266,13 +286,15 @@ function display_companies()
 			$delete = set_icon(ICON_DELETE, $delete);
 		}
     	label_cell("<a href='" . $_SERVER['PHP_SELF']. "?selected_id=$i'>$edit</a>");
+    	$name = "\"".$conn[$i]['name']."\"";
 		label_cell( $i == $coyno ? '' :
-			"<a href='javascript:deleteCompany(" . $i . ")'>$delete</a>");
+			"<a href='javascript:deleteCompany($i, $name)'>$delete</a>");
 		end_row();
 	}
 
 	end_table();
     display_note(_("The marked company is the current company which cannot be deleted."), 0, 0, "class='currentfg'");
+    display_note(_("If no Admin Password is entered, the new Admin Password will be '<b>password</b>' by default "), 1, 0, "class='currentfg'");
 }
 
 //---------------------------------------------------------------------------------------------
@@ -281,11 +303,6 @@ function display_company_edit($selected_id)
 {
 	global $def_coy, $db_connections, $tb_pref_counter;
 
-	if ($selected_id != -1)
-		$n = $selected_id;
-	else
-		$n = count($db_connections);
-
 	start_form();
 
 	start_table(TABLESTYLE2);
@@ -309,27 +326,42 @@ function display_company_edit($selected_id)
 		hidden('dbpassword', $_POST['dbpassword']);
 	}
 	else
+	{
 		$_POST['tbpref'] = $tb_pref_counter."_";
-	text_row_ex(_("Company"), 'name', 30);
-	text_row_ex(_("Host"), 'host', 30);
-	text_row_ex(_("Database User"), 'dbuser', 30);
+		// Insert the current settings as default
+		$conn = $db_connections[user_company()];
+		$_POST['name'] = '';
+		$_POST['host']  = $conn['host'];
+		$_POST['dbuser']  = $conn['dbuser'];
+		$_POST['dbpassword']  = $conn['dbpassword'];
+		$_POST['dbname']  = $conn['dbname'];
+	}
+
+	text_row_ex(_("Company"), 'name', 50);
+
 	if ($selected_id == -1)
+	{
+		text_row_ex(_("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);
-	if ($selected_id == -1)
+		text_row_ex(_("Database Name"), 'dbname', 30);
 		yesno_list_row(_("Table Pref"), 'tbpref', 1, $_POST['tbpref'], _("None"), false);
-	else
+	} else {
+		label_row(_("Host"), $_POST['host']);
+		label_row(_("Database User"), $_POST['dbuser']);
+		label_row(_("Database Name"), $_POST['dbname']);
 		label_row(_("Table Pref"), $_POST['tbpref']);
+	}
 	yesno_list_row(_("Default"), 'def', null, "", "", false);
 
-	coa_list_row(_("Database Script"), 'coa');
-
-	text_row_ex(_("New script Admin Password"), 'admpassword', 20);
+	if ($selected_id == -1)
+	{
+		coa_list_row(_("Database Script"), 'coa');
+		text_row_ex(_("New script Admin Password"), 'admpassword', 20);
+	}
 	end_table(1);
 
 	submit_center('save', _("Save"));
-//	echo "<center><input type='button' style='width:150px' value='". _("Save"). "'></center>";
-
 
 	end_form();
 }
@@ -338,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;
 }
 
@@ -358,4 +390,3 @@ display_company_edit($selected_id);
 //---------------------------------------------------------------------------------------------
 end_page();
 
-?>
\ No newline at end of file