From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
interface/web/sites/tools.inc.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 9c72201..11285e6 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -32,7 +32,7 @@
if ($name=="") return "";
// Array containing keys to search
- $keywordlist=array('CLIENTNAME','CLIENTID');
+ $keywordlist=array('CLIENTNAME','CLIENTID','DOMAINID');
// Try to match the key within the string
foreach ($keywordlist as $keyword) {
@@ -44,6 +44,9 @@
case 'CLIENTID':
$name=str_replace('['.$keyword.']', getClientID($dataRecord),$name);
break;
+ case 'DOMAINID':
+ $name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'],$name);
+ break;
}
}
}
@@ -52,8 +55,9 @@
function getClientName($dataRecord) {
global $app, $conf;
-
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ /* FS#1234 - CLIENTNAME value when in reseller account - need check this workarround impact */
+ //if($_SESSION["s"]["user"]["typ"] != 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ 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 {
@@ -79,7 +83,7 @@
function getClientID($dataRecord) {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ 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