From fb3a98c0f06fb14a188e5a020936768fa04cb205 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 22 Oct 2010 06:24:31 -0400
Subject: [PATCH] Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)
---
interface/web/client/client_del.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index 184b8f2..ffb858b 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -54,6 +54,9 @@
function onDelete() {
global $app, $conf,$list_def_file,$tform_def_file;
+ // Loading tform framework
+ if(!is_object($app->tform)) $app->uses('tform');
+
if($_POST["confirm"] == 'yes') {
parent::onDelete();
} else {
@@ -63,17 +66,16 @@
$app->tpl->setInclude('content_tpl', 'templates/client_del.htm');
include_once($list_def_file);
-
- // Loading tform framework
- if(!is_object($app->tform)) $app->uses('tform');
-
- // Load table definition from file
+
+ // Load table definition from file
$app->tform->loadFormDef($tform_def_file);
$this->id = intval($_REQUEST["id"]);
$this->dataRecord = $app->tform->getDataRecord($this->id);
$client_id = intval($this->dataRecord['client_id']);
+
+
//$parent_client_id = intval($this->dataRecord['parent_client_id']);
//$parent_user = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE client_id = $parent_client_id");
$client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id");
@@ -82,6 +84,7 @@
$tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic';
$tables_array = explode(',',$tables);
$client_group_id = intval($client_group['groupid']);
+
$table_list = array();
if($client_group_id > 1) {
foreach($tables_array as $table) {
--
Gitblit v1.9.1