From 7990f8881b085279269d35cf9dd2787b88ae1c08 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 27 Nov 2012 14:47:43 -0500
Subject: [PATCH] Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)
---
interface/web/dashboard/ajax_get_json.php | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php
index b134a84..e761f3e 100644
--- a/interface/web/dashboard/ajax_get_json.php
+++ b/interface/web/dashboard/ajax_get_json.php
@@ -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