X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fcreate_coy.php;h=a54ef45f1e08c486d00484f27679c3b27af465ba;hb=b32d16b2c0c6c43e569ebe87e2a13ceb892b5788;hp=ddce8db2ee0e18f46134b472f888e25c73cf19a8;hpb=1bcf988071670424e8bc88eb98156ecda13c3488;p=fa-stable.git

diff --git a/admin/create_coy.php b/admin/create_coy.php
index ddce8db2..a54ef45f 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -11,7 +11,7 @@ include_once($path_to_root . "/includes/ui.inc");
 
 page(_("Create/Update Company"));
 
-$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache');
+$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache', 'reporting');
 
 //---------------------------------------------------------------------------------------------
 
@@ -30,6 +30,26 @@ else
 
 function check_data()
 {
+	global $db_connections, $tb_pref_counter;
+
+	if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
+		return false;
+	foreach($db_connections as $id=>$con)
+	{
+	  	if ($_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;
 }
 
@@ -68,9 +88,10 @@ function handle_submit()
 	$db_connections[$id]['dbname'] = $_POST['dbname'];
 	if (isset($_GET['ul']) && $_GET['ul'] == 1)
 	{
-		if (is_numeric($_POST['tbpref']) && $_POST['tbpref'] == 1)
+		if (is_numeric($_POST['tbpref']))
 		{
-			$db_connections[$id]['tbpref'] = $tb_pref_counter."_";
+			$db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
+			  $tb_pref_counter."_" : '';
 			$new = true;
 		}
 		else if ($_POST['tbpref'] != "")
@@ -290,7 +311,7 @@ function display_company_edit($selected_id)
 
 	end_table();
 	display_note(_("Choose from Database scripts in SQL folder. No Datase is created without a script."), 0, 1);
-	echo "<center><input onclick='javascript:updateCompany()' type='button' style='width:150' value='". _("Save"). "'>";
+	echo "<center><input onclick='javascript:updateCompany()' type='button' style='width:150px' value='". _("Save"). "'></center>";
 
 
 	end_form();