Fixes for missing user data in referal list

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 4204fbb3c1f2f57926af7ebdd631306282a1e968..4a55f46e244a403e21f5c7f3886c7bad1cff3d80 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -258,11 +258,11 @@ function FILTER_RUN_SQLS ($data) {
                                        // Do we have an "ALTER TABLE" command?
                                        if (substr(strtolower($sql), 0, 11) == 'alter table') {
                                                // Analyse the alteration command
-                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
+                                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
                                                SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__);
                                        } else {
                                                // Run regular SQL command
-                                               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
+                                               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
                                                SQL_QUERY($sql, __FUNCTION__, __LINE__, false);
                                        }
                                } // END - if
@@ -282,7 +282,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
        // Recheck if logged in
        if (!isMember()) return false;
 
-       // Secure user ID
+       // Secure user id
        setUserId(getSession('userid'));
 
        // Load last module and last online time
@@ -456,11 +456,17 @@ function FILTER_COMPILE_EXTENSION ($code) {
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
                foreach ($matches[3] as $key => $cmd) {
-                       // Construct call-back function name
-                       $functionName = 'getExtension' . ucfirst(strtolower($cmd));
+                       // By default we have no extension installed, so 'false' is assumed
+                       $replacer = 'false';
 
-                       // Call the function
-                       $replacer = call_user_func_array($functionName, $matches[4][$key]);
+                       // Is the extension installed?
+                       if (isExtensionActive($matches[4][$key])) {
+                               // Construct call-back function name
+                               $functionName = 'getExtension' . ucfirst(strtolower($cmd));
+
+                               // Call the function
+                               $replacer = call_user_func_array($functionName, $matches[4][$key]);
+                       } // END - if
 
                        // Replace it and insert parameter for GET request
                        $code = str_replace($matches[0][$key], sprintf("&%s=%s&rev=%s", $cmd, $replacer, getConfig('CURR_SVN_REVISION')), $code);
@@ -510,7 +516,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_'));
 
                        // Update config
-                       if (getConfig('DEBUG_WEEKLY') != 'Y') updateConfiguration('last_week', $currWeek);
+                       if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek);
                } // END - if
 
                // Create current month mark
@@ -522,7 +528,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                        mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
                        // Update config
-                       if (getConfig('DEBUG_MONTHLY') != 'Y') updateConfiguration('last_month', $currMonth);
+                       if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth);
                } // END - if
        } // END - if