From e8a29cf134f7df1a1e7637083f6d7adf64949b7c Mon Sep 17 00:00:00 2001
From: jmontoya <jmontoya@ispconfig3>
Date: Wed, 04 Aug 2010 12:57:28 -0400
Subject: [PATCH] Adding new functions to the Remoting class
---
interface/web/sites/tools.inc.php | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 9c72201..1f707ab 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,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 {
@@ -79,7 +83,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 {
@@ -102,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