From 9cb77e00c93ad86c95e23b9377bcf2f92da9c75a Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 01 Nov 2012 07:52:23 -0400
Subject: [PATCH] Fixed: - log parsing did not recognize lines with multiple recipients - spamfilter_users added to datalog status messages
---
interface/lib/classes/auth.inc.php | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index 1002bd6..50d4950 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -47,7 +47,7 @@
public function has_clients($userid) {
global $app, $conf;
- $userid = intval($userid);
+ $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) {
return true;
@@ -60,8 +60,8 @@
public function add_group_to_user($userid,$groupid) {
global $app;
- $userid = intval($userid);
- $groupid = intval($groupid);
+ $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");
@@ -98,8 +98,8 @@
public function remove_group_from_user($userid,$groupid) {
global $app;
- $userid = intval($userid);
- $groupid = intval($groupid);
+ $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");
@@ -132,6 +132,16 @@
}
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.="$";
+ return crypt($cleartext_password,$salt);
+ }
}
--
Gitblit v1.9.1