From a008884b8f041577d43675f13c492f45fb9ee066 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Oct 2012 10:38:27 -0400
Subject: [PATCH] Merged revisions 3536-3555 from 3.0.5 stable branch.

---
 interface/web/dashboard/ajax_get_json.php |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php
index 9aa22ff..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');

--
Gitblit v1.9.1