From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
interface/lib/classes/auth.inc.php | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 50d4950..96e30b4 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -35,18 +35,18 @@
{
return $_SESSION['s']['user']['userid'];
}
-
+
public function is_admin() {
if($_SESSION['s']['user']['typ'] == 'admin') {
return true;
} else {
return false;
}
- }
-
+ }
+
public function has_clients($userid) {
global $app, $conf;
-
+
$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) {
@@ -55,19 +55,19 @@
return false;
}
}
-
+
//** This function adds a given group id to a given user.
- public function add_group_to_user($userid,$groupid) {
+ public function add_group_to_user($userid, $groupid) {
global $app;
-
+
$userid = $app->functions->intval($userid);
$groupid = $app->functions->intval($groupid);
-
+
if($userid > 0 && $groupid > 0) {
$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $userid");
- $groups = explode(',',$user['groups']);
- if(!in_array($groupid,$groups)) $groups[] = $groupid;
- $groups_string = implode(',',$groups);
+ $groups = explode(',', $user['groups']);
+ if(!in_array($groupid, $groups)) $groups[] = $groupid;
+ $groups_string = implode(',', $groups);
$sql = "UPDATE sys_user SET groups = '$groups_string' WHERE userid = $userid";
$app->db->query($sql);
return true;
@@ -80,33 +80,33 @@
public function get_client_limit($userid, $limitname)
{
global $app;
-
+
// simple query cache
- if($this->client_limits===null)
+ 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");
-
+
// isn't client -> no limit
if(!$this->client_limits)
return -1;
-
+
if(isset($this->client_limits['limit_'.$limitname])) {
return $this->client_limits['limit_'.$limitname];
- }
- }
-
+ }
+ }
+
//** This function removes a given group id from a given user.
- public function remove_group_from_user($userid,$groupid) {
+ public function remove_group_from_user($userid, $groupid) {
global $app;
-
+
$userid = $app->functions->intval($userid);
$groupid = $app->functions->intval($groupid);
-
+
if($userid > 0 && $groupid > 0) {
$user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $userid");
- $groups = explode(',',$user['groups']);
- $key = array_search($groupid,$groups);
+ $groups = explode(',', $user['groups']);
+ $key = array_search($groupid, $groups);
unset($groups[$key]);
- $groups_string = implode(',',$groups);
+ $groups_string = implode(',', $groups);
$sql = "UPDATE sys_user SET groups = '$groups_string' WHERE userid = $userid";
$app->db->query($sql);
return true;
@@ -114,35 +114,35 @@
return false;
}
}
-
+
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)) {
+ if(!stristr($_SESSION["s"]["user"]["modules"], $module)) {
// echo "LOGIN_REDIRECT:/index.php";
header("Location: /index.php");
exit;
}
}
-
+
public function get_random_password($length = 8) {
$base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
$password = '';
for ($n=0;$n<$length;$n++) {
- $password.=$base64_alphabet[mt_rand(0,63)];
+ $password.=$base64_alphabet[mt_rand(0, 63)];
}
return $password;
}
-
+
public function crypt_password($cleartext_password) {
$salt="$1$";
$base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
for ($n=0;$n<8;$n++) {
- $salt.=$base64_alphabet[mt_rand(0,63)];
+ $salt.=$base64_alphabet[mt_rand(0, 63)];
}
$salt.="$";
- return crypt($cleartext_password,$salt);
+ return crypt($cleartext_password, $salt);
}
-
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1