X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fcreate_coy.php;h=b43224abce6724db30095f0790540ca9cf0eee4b;hb=1273d798e494986d5d35b885ccbd0ccaaa0c2695;hp=ed557b6d97f62d814f9095ed4497da60e5525e00;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/admin/create_coy.php b/admin/create_coy.php
index ed557b6d..b43224ab 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -11,13 +11,14 @@ include_once($path_to_root . "/includes/ui.inc");
 
 page(_("Create/Update Company"));
 
+$comp_subdirs = array('images', 'pdf_files', 'backup','js_cache');
 
 //---------------------------------------------------------------------------------------------
 
 if (isset($_GET['selected_id']))
 {
 	$selected_id = $_GET['selected_id'];
-} 
+}
 elseif (isset($_POST['selected_id']))
 {
 	$selected_id = $_POST['selected_id'];
@@ -34,12 +35,27 @@ function check_data()
 
 //---------------------------------------------------------------------------------------------
 
+function remove_connection($id) {
+	global $db_connections;
+
+	$dbase = $db_connections[$id]['dbname'];
+	$err = db_drop_db($db_connections[$id]);
+
+	unset($db_connections[$id]);
+	$conn = array_values($db_connections);
+	$db_connections = $conn;
+	//$$db_connections = array_values($db_connections);
+    return $err;
+}
+//---------------------------------------------------------------------------------------------
+
 function handle_submit()
 {
-	global $db_connections, $def_coy, $tb_pref_counter, $db;
+	global $db_connections, $def_coy, $tb_pref_counter, $db,
+	    $comp_path, $comp_subdirs;
 
 	$new = false;
-	
+
 	if (!check_data())
 		return false;
 
@@ -52,7 +68,7 @@ function handle_submit()
 	$db_connections[$id]['dbname'] = $_POST['dbname'];
 	if (isset($_GET['ul']) && $_GET['ul'] == 1)
 	{
-		if ($_POST['tbpref'] == 1)
+		if (is_numeric($_POST['tbpref']) && $_POST['tbpref'] == 1)
 		{
 			$db_connections[$id]['tbpref'] = $tb_pref_counter."_";
 			$new = true;
@@ -61,36 +77,28 @@ function handle_submit()
 			$db_connections[$id]['tbpref'] = $_POST['tbpref'];
 		else
 			$db_connections[$id]['tbpref'] = "";
-	}		
+	}
 	if ((bool)$_POST['def'] == true)
 		$def_coy = $id;
-	$error = write_config_db($new);
-	if ($error == -1)
-		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
-	else if ($error == -2)	
-		display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php");
-	else if ($error == -3)
-		display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation."));
-	if ($error != 0)
-		return false;
 	if (isset($_GET['ul']) && $_GET['ul'] == 1)
 	{
 		$conn = $db_connections[$id];
 		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;
 		}
-	
+
 		$filename = $_FILES['uploadfile']['tmp_name'];
-		if (is_uploaded_file ($filename)) 
+		if (is_uploaded_file ($filename))
 		{
 			db_import($filename, $conn, $id);
 			if (isset($_POST['admpassword']) && $_POST['admpassword'] != "")
 				db_query("UPDATE ".$conn['tbpref']."users set password = '".md5($_POST['admpassword']). "' WHERE user_id = 'admin'");
-		} 
-		else 
+		}
+		else
 		{
 			display_error(_("Error uploading Database Script, please upload it manually"));
 			set_global_connection();
@@ -98,6 +106,28 @@ function handle_submit()
 		}
 		set_global_connection();
 	}
+	$error = write_config_db($new);
+	if ($error == -1)
+		display_error(_("Cannot open the configuration file - ") . $path_to_root . "/config_db.php");
+	else if ($error == -2)
+		display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php");
+	else if ($error == -3)
+		display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation."));
+	if ($error != 0) {
+		return false;
+	}
+	$index = "<?php\nheader(\"Location: ../../index.php\");\n?>";
+	
+	if ($new) {
+	    $cdir = $comp_path.'/'.($tb_pref_counter-1);
+	    @mkdir($cdir); 
+	    save_to_file($cdir.'/'.'index.php', 0, $index);
+	    
+	    foreach($comp_subdirs as $dir) {
+		@mkdir($cdir.'/'.$dir);
+		save_to_file($cdir.'/'.$dir.'/'.'index.php', 0, $index);
+	    }
+	}
 	return true;
 }
 
@@ -105,33 +135,38 @@ function handle_submit()
 
 function handle_delete()
 {
-	global $def_coy, $db_connections;
+	global $comp_path, $def_coy, $db_connections, $comp_subdirs;
 
-	$id = $_GET['id'];	
+	$id = $_GET['id'];
 
-	$dbase = $db_connections[$id]['dbname'];
-	$err = db_drop_db($db_connections[$id]);
+	$pref = $db_connections[$id]['tbpref'];
+	if($pref!='')
+	    $pref = substr($pref, 0, strlen($pref)-1); 
 
-	unset($db_connections[$id]);
-	$conn = array_values($db_connections);
-	$db_connections = $conn;
+	$err = remove_connection($id);
+	if ($err == 0)
+		display_error(_("Error removing Database: ") . $dbase . _(", please remove it manuallly"));
 
-	//$$db_connections = array_values($db_connections);
 	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");
-	else if ($error == -2)	
+	else if ($error == -2)
 		display_error(_("Cannot write to the configuration file - ") . $path_to_root . "/config_db.php");
 	else if ($error == -3)
 		display_error(_("The configuration file ") . $path_to_root . "/config_db.php" . _(" is not writable. Change its permissions so it is, then re-run the operation."));
 	if ($error != 0)
 		return;
-	if ($err == 0)
-		display_error(_("Error removing Database: ") . $dbase . _(", please remove it manuallly"));
-	else		
-		meta_forward($_SERVER['PHP_SELF']);
+
+	$cdir = $comp_path.'/'.$pref;
+	flush_dir($cdir);
+	if (!rmdir($cdir)) {
+		display_error(_("Cannot remove company data directory ") . $cdir);
+		return;
+	}
+	
+	meta_forward($_SERVER['PHP_SELF']);
 }
 
 //---------------------------------------------------------------------------------------------
@@ -141,7 +176,7 @@ function display_companies()
 	global $table_style, $def_coy, $db_connections;
 
 	$coyno = $_SESSION["wa_current_user"]->company;
-	
+
 	echo "
 		<script language='javascript'>
 		function deleteCompany(id) {
@@ -151,10 +186,10 @@ function display_companies()
 		}
 		</script>";
 	start_table($table_style);
-	
-	$th = array(_("Company"), _("Database Host"), _("Database User"), 
+
+	$th = array(_("Company"), _("Database Host"), _("Database User"),
 		_("Database Name"), _("Table Pref"), _("Default"), "", "");
-	table_header($th);	
+	table_header($th);
 
 	$k=0;
 	$conn = $db_connections;
@@ -196,25 +231,25 @@ function display_company_edit($selected_id)
 		$n = $selected_id;
 	else
 		$n = count($db_connections);
-	
+
 	start_form(true, true);
 
 	echo "
 		<script language='javascript'>
 		function updateCompany() {
-			if (document.forms[0].uploadfile.value!='' && document.forms[0].dbname.value!='') {			
+			if (document.forms[0].uploadfile.value!='' && document.forms[0].dbname.value!='') {
 				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].submit()
 		}
 		</script>";
-	
+
 	start_table($table_style2);
 
-	if ($selected_id != -1) 
+	if ($selected_id != -1)
 	{
 		$conn = $db_connections[$selected_id];
 		$_POST['name'] = $conn['name'];
@@ -224,9 +259,9 @@ function display_company_edit($selected_id)
 		$_POST['dbname']  = $conn['dbname'];
 		$_POST['tbpref']  = $conn['tbpref'];
 		if ($selected_id == $def_coy)
-			$_POST['def'] = true; 
-		else	
-			$_POST['def'] = false; 
+			$_POST['def'] = true;
+		else
+			$_POST['def'] = false;
 		$_POST['dbcreate']  = false;
 		hidden('selected_id', $selected_id);
 		hidden('tbpref', $_POST['tbpref']);
@@ -234,18 +269,18 @@ function display_company_edit($selected_id)
 	}
 	else
 		$_POST['tbpref'] = $tb_pref_counter."_";
-	text_row_ex(_("Company"), 'name', 20);
-	text_row_ex(_("Host"), 'host', 20);
-	text_row_ex(_("Database User"), 'dbuser', 20);
-	if ($selected_id == -1) 
-		text_row_ex(_("Database Password"), 'dbpassword', 20);
-	text_row_ex(_("Database Name"), 'dbname', 20);
+	text_row_ex(_("Company"), 'name', 30);
+	text_row_ex(_("Host"), 'host', 30);
+	text_row_ex(_("Database User"), 'dbuser', 30);
+	if ($selected_id == -1)
+		text_row_ex(_("Database Password"), 'dbpassword', 30);
+	text_row_ex(_("Database Name"), 'dbname', 30);
 	if ($selected_id == -1)
 		yesno_list_row(_("Table Pref"), 'tbpref', 1, $_POST['tbpref'], _("None"), false);
 	else
 		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'>");
@@ -264,19 +299,19 @@ function display_company_edit($selected_id)
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_GET['c']) && $_GET['c'] == 'df') 
+if (isset($_GET['c']) && $_GET['c'] == 'df')
 {
 
 	handle_delete();
 }
 
-if (isset($_GET['c']) && $_GET['c'] == 'u') 
+if (isset($_GET['c']) && $_GET['c'] == 'u')
 {
-	if (handle_submit()) 
+	if (handle_submit())
 	{
 		meta_forward($_SERVER['PHP_SELF']);
 	}
-}	
+}
 
 
 //---------------------------------------------------------------------------------------------