From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
interface/web/sites/tools.inc.php | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1f707ab..316abe6 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,9 +55,7 @@
function getClientName($dataRecord) {
global $app, $conf;
- /* 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'])) {
+ 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 {
@@ -98,7 +96,7 @@
}
}
/* get the name of the client */
- $tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . $client_group_id);
+ $tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . intval($client_group_id));
$clientID = $tmp['client_id'];
if ($clientID == '') $clientID = '0';
return $clientID;
@@ -106,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