From b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 13:12:41 -0400
Subject: [PATCH] removed hardcoded width for list search_limit select-element -> css defined
---
interface/web/sites/tools.inc.php | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 9c72201..262e278 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,9 +55,8 @@
function getClientName($dataRecord) {
global $app, $conf;
-
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- // Get the group-id of the user
+ // 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
@@ -63,13 +65,15 @@
} elseif (isset($dataRecord['parent_domain_id'])) {
$tmp = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = " . $dataRecord['parent_domain_id']);
$client_group_id = $tmp['sys_groupid'];
- } else {
+ } elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
- }
+ } else {
+ $client_group_id = 0;
+ }
}
/* get the name of the client */
- $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
+ $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . intval($client_group_id));
$clientName = $tmp['name'];
if ($clientName == "") $clientName = 'default';
$clientName = convertClientName($clientName);
@@ -89,12 +93,14 @@
} elseif (isset($dataRecord['parent_domain_id'])) {
$tmp = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = " . $dataRecord['parent_domain_id']);
$client_group_id = $tmp['sys_groupid'];
- } else {
+ } elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
- }
+ } else {
+ $client_group_id = 0;
+ }
}
/* get the name of the client */
- $tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . $client_group_id);
+ $tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . intval($client_group_id));
$clientID = $tmp['client_id'];
if ($clientID == '') $clientID = '0';
return $clientID;
--
Gitblit v1.9.1