From a79e5cc41c201926f918d655ef658e7f2ac752f6 Mon Sep 17 00:00:00 2001
From: Michael Fürmann <michael@spicyweb.de>
Date: Fri, 06 Mar 2015 12:32:22 -0500
Subject: [PATCH] renamed incremental sql file
---
interface/lib/classes/tools_sites.inc.php | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tools_sites.inc.php b/interface/lib/classes/tools_sites.inc.php
index 690a4f0..3400c5b 100644
--- a/interface/lib/classes/tools_sites.inc.php
+++ b/interface/lib/classes/tools_sites.inc.php
@@ -47,7 +47,7 @@
$name=str_replace('['.$keyword.']', $this->getClientID($dataRecord), $name);
break;
case 'DOMAINID':
- $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'], $name);
+ $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'] ? $dataRecord['parent_domain_id'] : '[DOMAINID]', $name);
break;
}
}
@@ -92,7 +92,7 @@
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
- $client_group_id = 0;
+ return '[CLIENTNAME]';
}
}
@@ -119,7 +119,7 @@
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
- $client_group_id = 0;
+ return '[CLIENTID]';
}
}
$tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . $app->functions->intval($client_group_id));
@@ -181,6 +181,19 @@
return $domain['domain'];
}
+ function getClientIdForDomain($domain_id) {
+ global $app;
+
+ $sql = "SELECT sys_groupid FROM domain WHERE domain_id = " . $app->functions->intval($domain_id);
+ if ($_SESSION["s"]["user"]["typ"] != 'admin') {
+ $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
+ $sql .= " AND sys_groupid IN (".$groups.")";
+ }
+ $domain = $app->db->queryOneRecord($sql);
+ if(!$domain || !$domain['sys_groupid']) return false;
+ return $domain['sys_groupid'];
+ }
+
}
?>
--
Gitblit v1.9.1