X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcreate_coy.php;h=badd946a1c525362bcc29486b835a8b582b58ae0;hb=a482c8ff040347dc7eb5a4962f23347053983f79;hp=29acd007ae6c31105881537f7529e5f13f2d55f6;hpb=279d7962a249da9cbc3074360e3a68a23a31145e;p=fa-stable.git

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 29acd007..badd946a 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -42,6 +42,11 @@ function check_data()
 
 	if ($_POST['name'] == "" || $_POST['host'] == "" || $_POST['dbuser'] == "" || $_POST['dbname'] == "")
 		return false;
+	if ($selected_id == -1 && (!isset($_GET['ul']) || $_GET['ul'] != 1))
+	{
+		display_error(_("When creating a new company, you must provide a Database script file."));
+		return false;
+	}
 	foreach($db_connections as $id=>$con)
 	{
 	 if($id != $selected_id && $_POST['host'] == $con['host'] 
@@ -80,14 +85,14 @@ function remove_connection($id) {
 function handle_submit()
 {
 	global $db_connections, $def_coy, $tb_pref_counter, $db,
-	    $comp_path, $comp_subdirs, $path_to_root;
+	    $comp_subdirs, $path_to_root;
 
-	$new = false;
 	$error = false;
 	if (!check_data())
 		return false;
 
 	$id = $_GET['id'];
+	$new = !isset($db_connections[$id]);
 
 	$db_connections[$id]['name'] = $_POST['name'];
 	$db_connections[$id]['host'] = $_POST['host'];
@@ -100,7 +105,6 @@ function handle_submit()
 		{
 			$db_connections[$id]['tbpref'] = $_POST['tbpref'] == 1 ?
 			  $tb_pref_counter."_" : '';
-			$new = true;
 		}
 		else if ($_POST['tbpref'] != "")
 			$db_connections[$id]['tbpref'] = $_POST['tbpref'];
@@ -146,7 +150,7 @@ function handle_submit()
 			{
 				display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
 				$error = true;
-			} else {
+			} elseif ($_POST['admpassword'] != "") {
 				db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
 			}
 		}
@@ -165,7 +169,7 @@ function handle_submit()
 
 	if ($new)
 	{
-		create_comp_dirs("$comp_path/$id", $comp_subdirs);
+		create_comp_dirs(company_path($id), $comp_subdirs);
 	}
 	$exts = get_company_extensions();
 	write_extensions($exts, $id);
@@ -177,14 +181,15 @@ function handle_submit()
 
 function handle_delete()
 {
-	global $comp_path, $def_coy, $db_connections, $comp_subdirs, $path_to_root;
+	global $def_coy, $db_connections, $comp_subdirs, $path_to_root;
 
 	$id = $_GET['id'];
 
 	// 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!
 	for($i = $id; $i < count($db_connections); $i++) {
-		if (!is_dir($comp_path.'/'.$i) || !is_writable($comp_path.'/'.$i)) {
+			$comp_path = company_path($i);
+		if (!is_dir($comp_path) || !is_writable($comp_path)) {
 			display_error(_('Broken company subdirectories system. You have to remove this company manually.'));
 			return;
 		}
@@ -198,15 +203,15 @@ function handle_delete()
 	// rename directory to temporary name to ensure all
 	// other subdirectories will have right owners even after
 	// unsuccessfull removal.
-	$cdir = $comp_path.'/'.$id;
-	$tmpname  = $comp_path.'/old_'.$id;
+	$cdir = company_path($id);
+	$tmpname  = company_path('/old_'.$id);
 	if (!@rename($cdir, $tmpname)) {
 		display_error(_('Cannot rename subdirectory to temporary name.'));
 		return;
 	}
 	// 'shift' company directories names
 	for ($i = $id+1; $i < count($db_connections); $i++) {
-		if (!rename($comp_path.'/'.$i, $comp_path.'/'.($i-1))) {
+		if (!rename(company_path($i), company_path($i-1))) {
 			display_error(_("Cannot rename company subdirectory"));
 			return;
 		}
@@ -235,14 +240,14 @@ function handle_delete()
 		display_error(_("Cannot remove temporary renamed company data directory ") . $tmpname);
 		return;
 	}
-	display_notification(_("Selected company as been deleted"));
+	display_notification(_("Selected company has been deleted"));
 }
 
 //---------------------------------------------------------------------------------------------
 
 function display_companies()
 {
-	global $table_style, $def_coy, $db_connections;
+	global $def_coy, $db_connections;
 
 	$coyno = $_SESSION["wa_current_user"]->company;
 
@@ -254,7 +259,7 @@ function display_companies()
 			document.location.replace('create_coy.php?c=df&id='+id)
 		}
 		</script>";
-	start_table($table_style);
+	start_table(TABLESTYLE);
 
 	$th = array(_("Company"), _("Database Host"), _("Database User"),
 		_("Database Name"), _("Table Pref"), _("Default"), "", "");
@@ -301,7 +306,7 @@ function display_companies()
 
 function display_company_edit($selected_id)
 {
-	global $def_coy, $db_connections, $tb_pref_counter, $table_style2;
+	global $def_coy, $db_connections, $tb_pref_counter;
 
 	if ($selected_id != -1)
 		$n = $selected_id;
@@ -323,7 +328,7 @@ function display_company_edit($selected_id)
 		}
 		</script>";
 
-	start_table($table_style2);
+	start_table(TABLESTYLE2);
 
 	if ($selected_id != -1)
 	{