Fixes for ext-online (not perfect, but working)

diff --git a/inc/filter/online_filter.php b/inc/filter/online_filter.php
index e24b674fd374d86103c5f908e1e8b9e99d06aaff..bd7726565414c84eae4f41ff320b61375b9144c4 100644 (file)
--- a/inc/filter/online_filter.php
+++ b/inc/filter/online_filter.php
@@ -59,7 +59,7 @@ function FILTER_UPDATE_ONLINE_LIST ($filterData) {
        $userid   = NULL;
        $isMember = convertBooleanToYesNo(isMember());
        $isAdmin  = convertBooleanToYesNo(isAdmin());
-       $action   = getActionFromModuleWhat(getModule(), getWhat());
+       $action   = getActionFromModuleWhat(getModule(), getWhat(false));
 
        // Valid userid?
        if (isMember()) {
@@ -92,7 +92,7 @@ LIMIT 1",
                array(
                        getModule(),
                        $action,
-                       getWhat(),
+                       getWhat(false),
                        convertZeroToNull($userid),
                        convertZeroToNull(determineReferralId()),
                        $isMember,
@@ -106,7 +106,7 @@ LIMIT 1",
                        array(
                                getModule(),
                                $action,
-                               getWhat(),
+                               getWhat(false),
                                convertZeroToNull($userid),
                                convertZeroToNull(determineReferralId()),
                                $isMember,

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c86787ebc2aa0b1bd191896f4dd6b9c1fe288806..76b94ebf864263378e32bb36d72456e5e77d369d 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -540,12 +540,12 @@ function isNicknameUsed ($userid) {
 }
 
 // Getter for 'what' value
-function getWhat () {
+function getWhat ($strict = true) {
        // Default is null
        $what = NULL;
 
        // Is the value set?
-       if (isWhatSet(true)) {
+       if (isWhatSet($strict)) {
                // Then use it
                $what = $GLOBALS['__what'];
        } // END - if
@@ -571,11 +571,12 @@ function setWhatFromConfig ($configEntry) {
 // Checks wether what is set and optionally aborts on miss
 function isWhatSet ($strict =  false) {
        // Check for it
-       $isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what'])));
+       $isset = ((isset($GLOBALS['__what']) && (!empty($GLOBALS['__what']))) || (is_null($GLOBALS['__what'])));
 
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {
                // Output backtrace
+               die(debug_get_printable_backtrace());
                debug_report_bug(__FUNCTION__, __LINE__, 'what is empty.');
        } // END - if
 
@@ -606,7 +607,7 @@ function setAction ($newAction) {
 // Checks wether action is set and optionally aborts on miss
 function isActionSet ($strict =  false) {
        // Check for it
-       $isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action'])));
+       $isset = (((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action']))) || (is_null($GLOBALS['__action'])));
 
        // Should we abort here?
        if (($strict === true) && ($isset === false)) {