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/reseller_edit.php | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/interface/web/client/reseller_edit.php b/interface/web/client/reseller_edit.php
index 1d02237..ca2780c 100644
--- a/interface/web/client/reseller_edit.php
+++ b/interface/web/client/reseller_edit.php
@@ -113,16 +113,30 @@
}
$app->tpl->setVar('tpl_add_select',$option);
- $sql = "SELECT template_additional FROM client WHERE client_id = " . $this->id;
- $result = $app->db->queryOneRecord($sql);
- $tplAdd = explode("/", $result['template_additional']);
- $text = '';
- foreach($tplAdd as $item){
- if (trim($item) != ''){
- if ($text != '') $text .= '<br />';
- $text .= $tpl[$item];
- }
- }
+ // check for new-style records
+ $result = $app->db->queryAllRecords('SELECT assigned_template_id, client_template_id FROM client_template_assigned WHERE client_id = ' . $this->id);
+ if($result && count($result) > 0) {
+ // new style
+ $text = '';
+ foreach($result as $item){
+ if (trim($item['client_template_id']) != ''){
+ if ($text != '') $text .= '';
+ $text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']]. '<a href="#" class="button icons16 icoDelete"></a></li>';
+ }
+ }
+ } else {
+ // old style
+ $sql = "SELECT template_additional FROM client WHERE client_id = " . $this->id;
+ $result = $app->db->queryOneRecord($sql);
+ $tplAdd = explode("/", $result['template_additional']);
+ $text = '';
+ foreach($tplAdd as $item){
+ if (trim($item) != ''){
+ if ($text != '') $text .= '';
+ $text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';
+ }
+ }
+ }
$app->tpl->setVar('template_additional_list', $text);
--
Gitblit v1.9.1