From 286d1bf1b746b49e43fd674bbc47afd25adfbedb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 31 Jan 2010 12:33:18 -0500
Subject: [PATCH] Fixed: FS#1053 - Syntax Error in form_list.php
---
interface/web/sites/tools.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 9c72201..16b1c5d 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;
}
}
}
@@ -53,7 +56,7 @@
function getClientName($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 {
@@ -79,7 +82,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