From a67681db7914d94f5e1956bd9ffdb9f882f0a2cb Mon Sep 17 00:00:00 2001
From: Sergio Cambra <sergio@programatica.es>
Date: Wed, 09 Jul 2014 07:07:12 -0400
Subject: [PATCH] disable onSubmit when dns' records tab is submitted
---
interface/web/client/client_edit.php | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index d8dd3e9..ecfa30f 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -291,14 +291,29 @@
}
//* 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 = $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 = $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 = $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 = $app->functions->intval($tmp['server_id']);
+ $tmp = $app->getconf->get_global_config('mail');
+ $default_mailserver = $app->functions->intval($tmp['default_mailserver']);
+ if (!$default_mailserver) {
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
+ $default_mailserver = $app->functions->intval($tmp['server_id']);
+ }
+ $tmp = $app->getconf->get_global_config('sites');
+ $default_webserver = $app->functions->intval($tmp['default_webserver']);
+ $default_dbserver = $app->functions->intval($tmp['default_dbserver']);
+ if (!$default_webserver) {
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE web_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
+ $default_webserver = $app->functions->intval($tmp['server_id']);
+ }
+ if (!$default_dbserver) {
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
+ $default_dbserver = $app->functions->intval($tmp['server_id']);
+ }
+ $tmp = $app->getconf->get_global_config('dns');
+ $default_dnsserver = $app->functions->intval($tmp['default_dnsserver']);
+ if (!$default_dnsserver) {
+ $tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE dns_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
+ $default_dnsserver = $app->functions->intval($tmp['server_id']);
+ }
$sql = "UPDATE client SET mail_servers = $default_mailserver, web_servers = $default_webserver, dns_servers = $default_dnsserver, default_slave_dnsserver = $default_dnsserver, db_servers = $default_dbserver WHERE client_id = ".$this->id;
$app->db->query($sql);
@@ -352,8 +367,8 @@
$subject = str_replace('{password}', $this->dataRecord['password'], $subject);
break;
case 'gender':
- $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message);
- $subject = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $subject);
+ $message = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $message);
+ $subject = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $subject);
break;
default:
$message = str_replace('{'.$key.'}', $val, $message);
@@ -364,7 +379,7 @@
//* Get sender address
if($app->auth->is_admin()) {
$app->uses('getconf');
- $system_config = $app->getconf->get_global_config();
+ $system_config = $app->getconf->get_global_config('mail');
$from = $system_config['admin_mail'];
} else {
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
--
Gitblit v1.9.1