From d2212dda734bb8c4b899faab848fa1bd7c1bf66e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 19 Sep 2010 08:01:47 -0400
Subject: [PATCH] Fixed bug in maildirmake function: http://www.howtoforge.com/forums/showthread.php?t=48890
---
interface/web/sites/tools.inc.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 16b1c5d..1f707ab 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,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 {
@@ -105,9 +106,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