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/dashboard/ajax_get_json.php | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php
index 817853d..e761f3e 100644
--- a/interface/web/dashboard/ajax_get_json.php
+++ b/interface/web/dashboard/ajax_get_json.php
@@ -42,7 +42,7 @@
if($type == 'globalsearch'){
- $q = $app->db->quote($_GET["q"]);
+ $q = $app->db->quote(trim($_GET["q"]));
$authsql = " AND ".$app->tform->getAuthSQL('r');
$modules = explode(',', $_SESSION['s']['user']['modules']);
@@ -55,7 +55,16 @@
$result[] = _search('client', 'reseller', "AND limit_client != 0");
// web sites
- $result[] = _search('sites', 'web_domain');
+ $result[] = _search('sites', 'web_domain', "AND type = 'vhost'");
+
+ // subdomains
+ $result[] = _search('sites', 'web_subdomain', "AND type = 'subdomain'");
+
+ // web site aliases
+ $result[] = _search('sites', 'web_aliasdomain', "AND type = 'alias'");
+
+ // vhostsubdomains
+ $result[] = _search('sites', 'web_vhost_subdomain', "AND type = 'vhostsubdomain'");
// FTP users
$result[] = _search('sites', 'ftp_user');
@@ -87,6 +96,9 @@
}
*/
$result[] = _search('sites', 'database');
+
+ // database users
+ $result[] = _search('sites', 'database_user');
// email domains
$result[] = _search('mail', 'mail_domain');
@@ -132,6 +144,9 @@
// virtual machines ip addresses
$result[] = _search('vm', 'openvz_ip');
+
+ // directive snippets
+ $result[] = _search('admin', 'directive_snippets');
$json = $app->functions->json_encode($result);
}
--
Gitblit v1.9.1