From 81e1f83025cfbdaabdf3a8fbb6126b5a372ac3cc Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 09 Aug 2013 08:12:05 -0400
Subject: [PATCH] - Implemented:  FS#3077 - Add gender field for client  - Implemented:  FS#1312 - disabling a whole client     -> see bugtracker comments for more details - Fixed:  FS#3060 - Subdomain vhost ip update on web domain update - Implemented:  FS#3078 - Change client template system: delete specific template from limits      -> including link in billing module to link specific assigned templates - Fixed:  FS#3058 - Error in mail quota calculation when changing tab in mailboxe configuration     -> quota limit no longer checked if it was not changed - Fixed: Deleting a client's template could mess up his assigned templates - Added: remoting functions to change client templates the new way

---
 interface/web/client/client_template_del.php |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/interface/web/client/client_template_del.php b/interface/web/client/client_template_del.php
index dbe8639..647ad7c 100644
--- a/interface/web/client/client_template_del.php
+++ b/interface/web/client/client_template_del.php
@@ -53,6 +53,13 @@
 	function onBeforeDelete() {
 		global $app;
 		
+		// check new style
+        $rec = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client_template_assigned WHERE client_template_id = ".$this->id);
+		if($rec['number'] > 0) {
+			$app->error($app->tform->lng('template_del_aborted_txt'));
+		}
+        
+        // check old style
 		$rec = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE template_master = ".$this->id." OR template_additional like '%/".$this->id."/%'");
 		if($rec['number'] > 0) {
 			$app->error($app->tform->lng('template_del_aborted_txt'));

--
Gitblit v1.9.1