SQL fixed, generateRandomCode() improved (is now generating better numbers)

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index d03062155950a7abff44db8496477c07746d3a64..881eb57395f1b1bd2d476de9c437f4b423dec756 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -58,7 +58,7 @@ function FILTER_FLUSH_FILTERS () {
                return false;
        } // END - if
 
-       // Is the extension sql_patches updated?
+       // Is the extension ext-sql_patches updated?
        if ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) {
                // Abort silently here
                logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . isExtensionInstalled('sql_patches') . ',isExtensionInstalledAndOlder()=' . isExtensionInstalledAndOlder('sql_patches', '0.5.9'));
@@ -293,7 +293,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        } // END - if
 
        // Recheck if logged in
-       if (!isMember()) {
+       if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) {
                return false;
        } // END - if
 
@@ -825,10 +825,10 @@ function FILTER_CHECK_ADMIN_ACL () {
 
 // Init random number/cache buster
 function FILTER_INIT_RANDOM_NUMBER () {
-       // Is the extension sql_patches installed and at least 0.3.6?
+       // Is the extension ext-sql_patches installed and at least 0.3.6?
        if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
                // Generate random number
-               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
+               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), ''));
        } else {
                // Generate *WEAK* code
                setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -971,9 +971,11 @@ function FILTER_FLUSH_TEMPLATE_CACHE () {
 }
 
 // Filter for loading user data
-function FILTER_FETCH_USER_DATA ($userid = 0) {
+function FILTER_FETCH_USER_DATA ($userid = NULL) {
        // Is the userid not set? Then use member id
-       if (($userid == '0') || (is_null($userid))) $userid = getMemberId();
+       if (!isValidUserId($userid)) {
+               $userid = getMemberId();
+       } // END - if
 
        // Get user data
        if (!fetchUserData($userid)) {