From cbdc7acabd3c61c3e8da7a3b04421f0d061fc5fa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 10:05:41 -0400
Subject: [PATCH] Merge branch 'hide_used_domains' into 'master'
---
interface/lib/classes/tools_sites.inc.php | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index c636bbc..690a4f0 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -144,10 +144,20 @@
return $res;
}
- function getDomainModuleDomains() {
+ function getDomainModuleDomains($not_used_in_table = null, $selected_domain = null) {
global $app;
$sql = "SELECT domain_id, domain FROM domain WHERE";
+ if ($not_used_in_table) {
+ if (strpos($not_used_in_table, 'dns') !== false) {
+ $field = "origin";
+ $select = "SUBSTRING($field, 1, CHAR_LENGTH($field) - 1)";
+ } else {
+ $field = "domain";
+ $select = $field;
+ }
+ $sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field != ?) AND";
+ }
if ($_SESSION["s"]["user"]["typ"] == 'admin') {
$sql .= " 1";
} else {
@@ -155,7 +165,7 @@
$sql .= " sys_groupid IN (".$groups.")";
}
$sql .= " ORDER BY domain";
- return $app->db->queryAllRecords($sql);
+ return $app->db->queryAllRecords($sql, $not_used_in_table, $selected_domain);
}
function checkDomainModuleDomain($domain_id) {
--
Gitblit v1.9.1