From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/client/client_edit.php | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 76616fc..2b72d81 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -40,7 +40,6 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-require_once('tools.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('client');
@@ -101,7 +100,7 @@
global $app;
- $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a'";
+ $sql = "SELECT template_id,template_name FROM client_template WHERE template_type = 'a' ORDER BY template_name ASC";
$tpls = $app->db->queryAllRecords($sql);
$option = '';
$tpl = array();
@@ -117,8 +116,8 @@
$text = '';
foreach($tplAdd as $item){
if (trim($item) != ''){
- if ($text != '') $text .= '<br />';
- $text .= $tpl[$item];
+ if ($text != '') $text .= '';
+ $text .= '<li>' . $tpl[$item]. '</li>';
}
}
@@ -165,24 +164,22 @@
//* to his groups, so he can administrate the records of this client.
if($_SESSION['s']['user']['typ'] == 'user') {
$app->auth->add_group_to_user($_SESSION['s']['user']['userid'],$groupid);
- $app->db->query("UPDATE client SET parent_client_id = ".intval($_SESSION['s']['user']['client_id'])." WHERE client_id = ".$this->id);
+ $app->db->query("UPDATE client SET parent_client_id = ".$app->functions->intval($_SESSION['s']['user']['client_id'])." WHERE client_id = ".$this->id);
}
//* Set the default servers
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
- $default_mailserver = intval($tmp['server_id']);
+ $default_mailserver = $app->functions->intval($tmp['server_id']);
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
- $default_webserver = intval($tmp['server_id']);
+ $default_webserver = $app->functions->intval($tmp['server_id']);
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
- $default_dnsserver = intval($tmp['server_id']);
+ $default_dnsserver = $app->functions->intval($tmp['server_id']);
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
- $default_dbserver = intval($tmp['server_id']);
+ $default_dbserver = $app->functions->intval($tmp['server_id']);
- $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id;
+ $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_slave_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id;
$app->db->query($sql);
- /* If there is a client-template, process it */
- applyClientTemplates($this->id);
parent::onAfterInsert();
}
@@ -193,7 +190,7 @@
the data was successful updated in the database.
*/
function onAfterUpdate() {
- global $app;
+ global $app, $conf;
// username changed
if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['username']) && $this->dataRecord['username'] != '' && $this->oldDataRecord['username'] != $this->dataRecord['username']) {
$username = $app->db->quote($this->dataRecord["username"]);
@@ -239,10 +236,6 @@
$app->db->query($sql);
}
- /*
- * If there is a client-template, process it */
- applyClientTemplates($this->id);
-
parent::onAfterUpdate();
}
}
--
Gitblit v1.9.1