From 0deff130c6d7404da71e9ab9d8ee738112bd4f74 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 05 Jun 2015 10:47:18 -0400
Subject: [PATCH] add mailfilter to resync
---
interface/lib/classes/auth.inc.php | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 562cf40..e281c03 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -114,7 +114,7 @@
$groupid = $app->functions->intval($groupid);
if($userid > 0 && $groupid > 0) {
- $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ", $userid);
+ $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ?", $userid);
$groups = explode(',', $user['groups']);
$key = array_search($groupid, $groups);
unset($groups[$key]);
@@ -129,11 +129,32 @@
public function check_module_permissions($module) {
// Check if the current user has the permissions to access this module
+ $module = trim(preg_replace('@\s+@', '', $module));
$user_modules = explode(',',$_SESSION["s"]["user"]["modules"]);
- if(!in_array($module,$user_modules)) {
- // echo "LOGIN_REDIRECT:/index.php";
- header("Location: /index.php");
- exit;
+ if(strpos($module, ',') !== false){
+ $can_use_module = false;
+ $tmp_modules = explode(',', $module);
+ if(is_array($tmp_modules) && !empty($tmp_modules)){
+ foreach($tmp_modules as $tmp_module){
+ if($tmp_module != ''){
+ if(in_array($tmp_module,$user_modules)) {
+ $can_use_module = true;
+ break;
+ }
+ }
+ }
+ }
+ if(!$can_use_module){
+ // echo "LOGIN_REDIRECT:/index.php";
+ header("Location: /index.php");
+ exit;
+ }
+ } else {
+ if(!in_array($module,$user_modules)) {
+ // echo "LOGIN_REDIRECT:/index.php";
+ header("Location: /index.php");
+ exit;
+ }
}
}
@@ -153,13 +174,43 @@
}
- public function get_random_password($length = 8) {
- $base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- $password = '';
- for ($n=0;$n<$length;$n++) {
- $password.=$base64_alphabet[mt_rand(0, 63)];
+ public function get_random_password($minLength = 8, $special = false) {
+ if($minLength < 8) $minLength = 8;
+ $maxLength = $minLength + 5;
+ $length = mt_rand($minLength, $maxLength);
+
+ $alphachars = "abcdefghijklmnopqrstuvwxyz";
+ $upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ $numchars = "1234567890";
+ $specialchars = "!@#_";
+
+ $num_special = 0;
+ if($special == true) {
+ $num_special = intval(mt_rand(0, round($length / 4))) + 1;
}
- return $password;
+ $numericlen = mt_rand(1, 2);
+ $alphalen = $length - $num_special - $numericlen;
+ $upperlen = intval($alphalen / 2);
+ $alphalen = $alphalen - $upperlen;
+ $password = '';
+
+ for($i = 0; $i < $alphalen; $i++) {
+ $password .= substr($alphachars, mt_rand(0, strlen($alphachars) - 1), 1);
+ }
+
+ for($i = 0; $i < $upperlen; $i++) {
+ $password .= substr($upperchars, mt_rand(0, strlen($upperchars) - 1), 1);
+ }
+
+ for($i = 0; $i < $num_special; $i++) {
+ $password .= substr($specialchars, mt_rand(0, strlen($specialchars) - 1), 1);
+ }
+
+ for($i = 0; $i < $numericlen; $i++) {
+ $password .= substr($numchars, mt_rand(0, strlen($numchars) - 1), 1);
+ }
+
+ return str_shuffle($password);
}
public function crypt_password($cleartext_password) {
--
Gitblit v1.9.1