X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcreate_coy.php;h=9ac71ef0bf2d1370984f800cf416783d4ea6f8c6;hb=bb991dc5b071e966b39954bb53d3b0efe8420938;hp=6667ea451e85da955df725451a9f3ab917642748;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 6667ea45..9ac71ef0 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;
-
-	$new = false;
+	    $comp_subdirs, $path_to_root;
 
+	$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'];
@@ -115,25 +119,41 @@ function handle_submit()
 		if (($db = db_create_db($conn)) == 0)
 		{
 			display_error(_("Error creating Database: ") . $conn['dbname'] . _(", Please create it manually"));
-			remove_connection($id);
-			set_global_connection();
-			return false;
-		}
+			$error = true;
+		} else {
 
-		$filename = $_FILES['uploadfile']['tmp_name'];
-		if (is_uploaded_file ($filename))
-		{
-			db_import($filename, $conn, $id);
-			if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")	
-				update_admin_password($conn, md5($_POST['admpassword']));
+			$filename = $_FILES['uploadfile']['tmp_name'];
+			if (is_uploaded_file ($filename))
+			{
+				if (!db_import($filename, $conn, $id)) {
+					display_error(_('Cannot create new company due to bugs in sql file.'));
+					$error = true;
+				} else
+				if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
+					update_admin_password($conn, md5($_POST['admpassword']));
+			}
+			else
+			{
+				display_error(_("Error uploading Database Script, please upload it manually"));
+				$error = true;
+			}
 		}
-		else
-		{
-			display_error(_("Error uploading Database Script, please upload it manually"));
-			set_global_connection();
+		set_global_connection();
+		if ($error) {
+			remove_connection($id);
 			return false;
 		}
-		set_global_connection();
+	} else {
+		if ($_GET['c'] = 'u') {
+			$conn = $db_connections[$id];
+			if (($db = db_create_db($conn)) == 0)
+			{
+				display_error(_("Error connecting to Database: ") . $conn['dbname'] . _(", Please correct it"));
+				$error = true;
+			} elseif ($_POST['admpassword'] != "") {
+				db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
+			}
+		}
 	}
 	$error = write_config_db($new);
 	if ($error == -1)
@@ -149,10 +169,11 @@ 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);
+	display_notification($new ? _('New company has been created.') : _('Company has been updated.'));
 	return true;
 }
 
@@ -160,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;
 		}
@@ -181,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;
 		}
@@ -218,15 +240,14 @@ function handle_delete()
 		display_error(_("Cannot remove temporary renamed company data directory ") . $tmpname);
 		return;
 	}
-
-	meta_forward($_SERVER['PHP_SELF']);
+	display_notification(_("Selected company as been deleted"));
 }
 
 //---------------------------------------------------------------------------------------------
 
 function display_companies()
 {
-	global $table_style, $def_coy, $db_connections;
+	global $def_coy, $db_connections;
 
 	$coyno = $_SESSION["wa_current_user"]->company;
 
@@ -238,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"), "", "");
@@ -285,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;
@@ -301,13 +322,13 @@ function display_company_edit($selected_id)
 				document.forms[0].action='create_coy.php?c=u&ul=1&id=" . $n . "&fn=' + document.forms[0].uploadfile.value
 			}
 			else {
-				document.forms[0].action='create_coy.php?c=u&id=" . $n . "&fn=' + document.forms[0].uploadfile.value
+				document.forms[0].action='create_coy.php?c=u&id=" . $n . "'
 			}
 			document.forms[0].submit()
 		}
 		</script>";
 
-	start_table($table_style2);
+	start_table(TABLESTYLE2);
 
 	if ($selected_id != -1)
 	{
@@ -341,10 +362,7 @@ function display_company_edit($selected_id)
 		label_row(_("Table Pref"), $_POST['tbpref']);
 	yesno_list_row(_("Default"), 'def', null, "", "", false);
 
-	start_row();
-	label_cell(_("Database Script"));
-	label_cell("<input name='uploadfile' type='file'>");
-	end_row();
+	file_row(_("Database Script"), "uploadfile");
 
 	text_row_ex(_("New script Admin Password"), 'admpassword', 20);
 
@@ -359,19 +377,14 @@ function display_company_edit($selected_id)
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['c']) && $_GET['c'] == 'df')
-{
-
+if (isset($_GET['c']) && $_GET['c'] == 'df') {
 	handle_delete();
+	$selected_id = -1;
 }
 
 if (isset($_GET['c']) && $_GET['c'] == 'u')
-{
 	if (handle_submit())
-	{
-		meta_forward($_SERVER['PHP_SELF']);
-	}
-}
+		$selected_id = -1;
 
 
 //---------------------------------------------------------------------------------------------