Bug with multiple registration of filters fixed (see fix_filters.php for details)

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 010cad850080d80485c4f72b0e44db0ca4d2ecc9..db721a542e5b3e9aaa02ab60781e010421b0aeb1 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -922,7 +922,7 @@ function redirectToUrl ($URL) {
        } // END - if
 
        // Three different debug ways...
-       /* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
+       //* DEBUG: */ debug_report_bug(sprintf("%s[%s:] URL=%s", __FUNCTION__, __LINE__, $URL));
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, $URL);
        //* DEBUG: */ die($URL);
 
@@ -3228,12 +3228,12 @@ function DETERMINE_REFID () {
        } elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
                // Set session refid als global
                $GLOBALS['refid'] = bigintval(getSession('refid'));
-       } elseif ((GET_EXT_VERSION('sql_patches') != '') && (getConfig('def_refid') > 0)) {
-               // Set default refid as refid in URL
-               $GLOBALS['refid'] = getConfig('def_refid');
        } elseif ((GET_EXT_VERSION('user') >= '0.3.4') && (getConfig('select_user_zero_refid')) == 'Y') {
                // Select a random user which has confirmed enougth mails
                $GLOBALS['refid'] = determineRandomReferalId();
+       } elseif ((GET_EXT_VERSION('sql_patches') != '') && (getConfig('def_refid') > 0)) {
+               // Set default refid as refid in URL
+               $GLOBALS['refid'] = getConfig('def_refid');
        } else {
                // No default ID when sql_patches is not installed or none set
                $GLOBALS['refid'] = 0;
@@ -3430,7 +3430,7 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                // Exclude '.', '..' and entries in $excludeArray automatically
                if (in_array($baseFile, $excludeArray, true))  {
                        // Exclude them
-                       //* DEBUG: */ print 'excluded=' . $baseFile . '<br />';
+                       //* DEBUG: */ print 'excluded=' . $baseFile . "<br />\n";
                        continue;
                } // END - if
 
@@ -3444,9 +3444,9 @@ function getArrayFromDirectory ($baseDir, $prefix, $fileIncludeDirs = false, $ad
                // Check if the base filename matches an exclusion pattern and if the pattern is not empty
                if ((!empty($excludePattern)) && (preg_match($excludePattern, $baseFile, $match))) {
                        // These Lines are only for debugging!!
-                       //* DEBUG: */ print 'baseDir:' . $baseDir . '<br />';
-                       //* DEBUG: */ print 'baseFile:' . $baseFile . '<br />';
-                       //* DEBUG: */ print 'FQFN:' . $FQFN . '<br />';
+                       //* DEBUG: */ print 'baseDir:' . $baseDir . "<br />\n";
+                       //* DEBUG: */ print 'baseFile:' . $baseFile . "<br />\n";
+                       //* DEBUG: */ print 'FQFN:' . $FQFN . "<br />\n";
 
                        // Exclude this one
                        continue;