From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
interface/web/sites/tools.inc.php | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 81de9f6..3e432d9 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -27,34 +27,36 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-function replacePrefix($name, $dataRecord){
- $keywordlist=array('CLIENTNAME','CLIENTID');
+function replacePrefix($name, $dataRecord) {
+ // No input -> no possible output -> go out!
+ if ($name=="") return "";
- if ($name != '') {
- foreach ($keywordlist as $keyword) {
- if (substr_count($name, '['.$keyword.']') > 0) {
- switch ($keyword) {
- case 'CLIENTNAME':
- $res=str_replace('['.$keyword.']', getClientName($dataRecord), $name);
- break;
- case 'CLIENTID':
- $res=str_replace('['.$keyword.']', getClientID($dataRecord), $name);
- break;
- }
- }
- }
- } else {
- $res='';
- }
-
- return $res;
+ // Array containing keys to search
+ $keywordlist=array('CLIENTNAME','CLIENTID','DOMAINID');
+
+ // Try to match the key within the string
+ foreach ($keywordlist as $keyword) {
+ if (substr_count($name, '['.$keyword.']') > 0) {
+ switch ($keyword) {
+ case 'CLIENTNAME':
+ $name=str_replace('['.$keyword.']', getClientName($dataRecord),$name);
+ break;
+ case 'CLIENTID':
+ $name=str_replace('['.$keyword.']', getClientID($dataRecord),$name);
+ break;
+ case 'DOMAINID':
+ $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'],$name);
+ break;
+ }
+ }
+ }
+ return $name;
}
function getClientName($dataRecord) {
global $app, $conf;
-
- if($_SESSION["s"]["user"]["typ"] != 'admin') {
- // Get the group-id of the user
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ // Get the group-id of the user if the logged in user is neither admin nor reseller
$client_group_id = $_SESSION["s"]["user"]["default_group"];
} else {
// Get the group-id from the data itself
@@ -79,7 +81,7 @@
function getClientID($dataRecord) {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') {
+ if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the group-id of the user
$client_group_id = $_SESSION["s"]["user"]["default_group"];
} else {
--
Gitblit v1.9.1