From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 5 May 2011 07:41:39 +0000 (+0200)
Subject: Also display company name in warning when pressing delete company.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=76817e1db4fc96382c7bdff9bcc528fea24712e5;p=fa-stable.git

Also display company name in warning when pressing delete company.
---

diff --git a/admin/create_coy.php b/admin/create_coy.php
index 66d01d1d..afb02660 100644
--- a/admin/create_coy.php
+++ b/admin/create_coy.php
@@ -238,8 +238,8 @@ function display_companies()
 
 	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)
 		}
@@ -278,8 +278,9 @@ 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();
 	}
 
@@ -320,6 +321,7 @@ function display_company_edit($selected_id)
 		$_POST['tbpref'] = $tb_pref_counter."_";
 		// 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'];