From 68b702b680cd7eacb5f6f3aaa3ef87e24fb0bd0d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 09 Jul 2014 06:50:33 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/lib/classes/auth.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 96e30b4..070662f 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -33,7 +33,8 @@
public function get_user_id()
{
- return $_SESSION['s']['user']['userid'];
+ global $app;
+ return $app->functions->intval($_SESSION['s']['user']['userid']);
}
public function is_admin() {
@@ -49,7 +50,7 @@
$userid = $app->functions->intval($userid);
$client = $app->db->queryOneRecord("SELECT client.limit_client FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
- if($client['limit_client'] > 0) {
+ if($client['limit_client'] != 0) {
return true;
} else {
return false;
@@ -80,7 +81,9 @@
public function get_client_limit($userid, $limitname)
{
global $app;
-
+
+ $userid = $app->functions->intval($userid);
+
// simple query cache
if($this->client_limits===null)
$this->client_limits = $app->db->queryOneRecord("SELECT client.* FROM sys_user, client WHERE sys_user.userid = $userid AND sys_user.client_id = client.client_id");
--
Gitblit v1.9.1