From 8677124afa9ddf23e34540565200d82ae1502bad Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 18 May 2012 09:25:42 -0400
Subject: [PATCH] Fixed: FS#2240 - Update 3.0.4.5 problem on all ftp users ( not working )

---
 interface/web/sites/tools.inc.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 38e8804..3e432d9 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,8 +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
+    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
@@ -81,7 +81,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