From 7272e49c868f30d434965a59b1dc209925aec1b2 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Aug 2014 03:58:25 -0400
Subject: [PATCH] Improved database library.
---
interface/lib/classes/auth.inc.php | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 96e30b4..5be11cb 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -33,11 +33,20 @@
public function get_user_id()
{
- return $_SESSION['s']['user']['userid'];
+ global $app;
+ return $app->functions->intval($_SESSION['s']['user']['userid']);
}
public function is_admin() {
if($_SESSION['s']['user']['typ'] == 'admin') {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public function is_superadmin() {
+ if($_SESSION['s']['user']['typ'] == 'admin' && $_SESSION['s']['user']['userid'] === 1) {
return true;
} else {
return false;
@@ -49,7 +58,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 +89,10 @@
public function get_client_limit($userid, $limitname)
{
global $app;
-
+
+ $userid = $app->functions->intval($userid);
+ if(!preg_match('/^[a-zA-Z0-9\-\_]{1,64}$/',$limitname)) $app->error('Invalid limit name '.$limitname);
+
// 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");
@@ -117,7 +129,8 @@
public function check_module_permissions($module) {
// Check if the current user has the permissions to access this module
- if(!stristr($_SESSION["s"]["user"]["modules"], $module)) {
+ $user_modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+ if(!in_array($module,$user_modules)) {
// echo "LOGIN_REDIRECT:/index.php";
header("Location: /index.php");
exit;
--
Gitblit v1.9.1