mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 01:25:01 +02:00
Code Issues Releases Wiki Activity

globals cleanup

Browse Source
This commit is contained in:
secretr
2011-09-14 11:09:05 +00:00
parent 024d0250ea
commit 6c6a0a9b40
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_handlers/user_handler.php
View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2010 e107 Inc (e107.org) * Copyright (C) 2008-2011 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -63,7 +63,7 @@ class UserHandler
// Constructor // Constructor
public function __construct() public function __construct()
{ {
global $pref; $pref = e107::getPref();
/** /**
Table of vetting methods for user data - lists every field whose value could be set manually. Table of vetting methods for user data - lists every field whose value could be set manually.
@@ -447,7 +447,6 @@ class UserHandler
*/ */
public function makeUserCookie($lode,$autologin = FALSE) public function makeUserCookie($lode,$autologin = FALSE)
{ {
global $pref;
$cookieval = $lode['user_id'].'.'.md5($lode['user_password']); // (Use extra md5 on cookie value to obscure hashed value for password) $cookieval = $lode['user_id'].'.'.md5($lode['user_password']); // (Use extra md5 on cookie value to obscure hashed value for password)
if (e107::getPref('user_tracking') == 'session') if (e107::getPref('user_tracking') == 'session')
{ {
@@ -588,8 +587,7 @@ Following fields auto-filled in code as required:
*/ */
public function userValidation(&$targetData) public function userValidation(&$targetData)
{ {
global $e107, $pref; $u_sql = e107::getDb('u');
$u_sql = new db;
$ret = TRUE; $ret = TRUE;
$errMsg = ''; $errMsg = '';
if (isset($targetData['data']['user_email'])) if (isset($targetData['data']['user_email']))
@@ -597,7 +595,7 @@ Following fields auto-filled in code as required:
$v = trim($targetData['data']['user_email']); // Always check email address if its entered $v = trim($targetData['data']['user_email']); // Always check email address if its entered
if ($v == '') if ($v == '')
{ {
if (!varsettrue($pref['disable_emailcheck'])) if (!e107::getPref('disable_emailcheck'))
{ {
$errMsg = ERR_MISSING_VALUE; $errMsg = ERR_MISSING_VALUE;
} }
@@ -614,7 +612,7 @@ Following fields auto-filled in code as required:
{ // See if email address banned { // See if email address banned
$wc = $this->make_email_query($v); // Generate the query for the ban list $wc = $this->make_email_query($v); // Generate the query for the ban list
if ($wc) { $wc = "`banlist_ip`='{$v}' OR ".$wc; } if ($wc) { $wc = "`banlist_ip`='{$v}' OR ".$wc; }
if (($wc === FALSE) || !$e107->check_ban($wc, FALSE, TRUE)) if (($wc === FALSE) || e107::getInstance()->check_ban($wc, FALSE, TRUE))
{ {
// echo "Email banned<br />"; // echo "Email banned<br />";
$errMsg = ERR_BANNED_EMAIL; $errMsg = ERR_BANNED_EMAIL;
@@ -627,7 +625,7 @@ Following fields auto-filled in code as required:
} }
else else
{ {
if (!isset($targetData['errors']['user_email']) && !varset($pref['disable_emailcheck'],FALSE)) if (!isset($targetData['errors']['user_email']) && !e107::getPref('disable_emailcheck'))
{ // We may have already picked up an error on the email address - or it may be allowed to be empty { // We may have already picked up an error on the email address - or it may be allowed to be empty
$errMsg = ERR_MISSING_VALUE; $errMsg = ERR_MISSING_VALUE;
} }
@@ -679,7 +677,9 @@ Following fields auto-filled in code as required:
*/ */
public function deleteExpired($force = FALSE) public function deleteExpired($force = FALSE)
{ {
global $pref, $sql; $pref = e107::getPref();
$sql = e107::getDb();
$temp1 = 0; $temp1 = 0;
if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2) if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
{ {
@@ -706,8 +706,7 @@ Following fields auto-filled in code as required:
*/ */
public function userClassUpdate(&$user, $event='userveri') public function userClassUpdate(&$user, $event='userveri')
{ {
global $pref; $pref = e107::getPref();
$tp = e107::getParser(); $tp = e107::getParser();
$initClasses = array(); $initClasses = array();