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 | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1e87ef9..3e432d9 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,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
+ 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
@@ -82,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 {
@@ -105,9 +104,9 @@
function convertClientName($name){
/**
- * only allow 'a'..'z', '_', '-', '0'..'9'
+ * only allow 'a'..'z', '_', '0'..'9'
*/
- $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_-';
+ $allowed = 'abcdefghijklmnopqrstuvwxyz0123456789_';
$res = '';
$name = strtolower(trim($name));
for ($i=0; $i < strlen($name); $i++){
--
Gitblit v1.9.1