From fea974d01416c9ecb57f801b1796d1332918063a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 23 Jan 2012 09:53:52 -0500
Subject: [PATCH] Fixed: FS#1997 - Check encoding of the subject in ispconfig mail sending function.
---
interface/web/sites/tools.inc.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1e87ef9..38e8804 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,7 +55,6 @@
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
$client_group_id = $_SESSION["s"]["user"]["default_group"];
@@ -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