From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/client/client_del.php | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index b125ba4..fd560e7 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -44,6 +44,7 @@
//* Check permissions for module
$app->auth->check_module_permissions('client');
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
$app->uses('tpl,tform');
$app->load('tform_actions');
@@ -52,6 +53,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();
@@ -62,25 +66,25 @@
$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");
// Get all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'client,dns_rr,dns_soa,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 = 'cron,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) {
@@ -127,7 +131,7 @@
$app->db->query("DELETE FROM sys_user WHERE client_id = $client_id");
// Delete all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'client,dns_rr,dns_soa,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 = '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,web_folder,web_folder_user,domain';
$tables_array = explode(',',$tables);
$client_group_id = intval($client_group['groupid']);
if($client_group_id > 1) {
@@ -163,4 +167,4 @@
$page = new page_action;
$page->onDelete()
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1