Naming inconsistencies for userid fixed

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 5f6b9eed8424fb610d9d5f789149beb54ea59005..4426a95aa66ce611a60ba19814e5edac3a55e83d 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -283,10 +283,10 @@ function FILTER_UPDATE_LOGIN_DATA () {
        if (!isMember()) return false;
 
        // Secure user id
-       setUserId(getSession('userid'));
+       setMemberId(getSession('userid'));
 
        // Found a userid?
-       if (fetchUserData(getUserId())) {
+       if (fetchUserData(getMemberId())) {
                // Load last module and online time
                $content = getUserDataArray();
 
@@ -311,11 +311,11 @@ function FILTER_UPDATE_LOGIN_DATA () {
                        array(
                                getWhat(),
                                detectRemoteAddr(),
-                               getUserId()
+                               getMemberId()
                        ), __FUNCTION__, __LINE__);
        }  else {
                // Destroy session, we cannot update!
-               destroyUserSession();
+               destroyMemberSession();
        }
 }
 
@@ -366,7 +366,7 @@ function FILTER_DETERMINE_USERNAME () {
        // Check if logged in
        if (isMember()) {
                // Is still logged in so we welcome him with his name
-               if (fetchUserData(getUserId())) {
+               if (fetchUserData(getMemberId())) {
                        // Load surname and family's name and build the username
                        $content = getUserDataArray();
 
@@ -383,10 +383,7 @@ function FILTER_DETERMINE_USERNAME () {
                        setUsername('<em>{--USERNAME_UNKNOWN--}</em>');
 
                        // Destroy session
-                       destroyUserSession();
-
-                       // Kill userid
-                       setUserId(0);
+                       destroyMemberSession();
                }
        } elseif (isAdmin()) {
                // Admin is there
@@ -398,40 +395,55 @@ function FILTER_DETERMINE_USERNAME () {
 }
 
 // Filter for compiling config entries
-function FILTER_COMPILE_CONFIG ($code) {
-       // Compile {?some_var?} to getConfig('some_var')
-       preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
+       // Save the uncompiled code
+       $uncompiled = $code;
+
+       // Do we have cache?
+       if (!isset($GLOBALS['compiled_config'][$code])) {
+               // Compile {?some_var?} to getConfig('some_var')
+               preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+
+               // Some entries found?
+               if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+                       // Replace all matches
+                       foreach ($matches[0] as $key => $match) {
+                               // Do we have cache?
+                               if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
+                                       // Is the config valid?
+                                       if (isConfigEntrySet($matches[1][$key])) {
+                                               // Set it for caching
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . $matches[1][$key] . "').\"";
+                                       } elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
+                                               // Use default value
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+                                       } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
+                                               // No config, try the language system
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\".getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+                                       } else {
+                                               // Unhandled!
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
+                                       }
+                               } // END - if
 
-       // Some entries found?
-       if ((count($matches) > 0) && (count($matches[0]) > 0)) {
-               // Replace all matches
-               foreach ($matches[0] as $key => $match) {
-                       // Do we have cache?
-                       if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
-                               // Is the config valid?
-                               if (isConfigEntrySet($matches[1][$key])) {
-                                       // Set it for caching
-                                       $GLOBALS['compile_config'][$matches[1][$key]] = getConfig($matches[1][$key]);
-                               } elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
-                                       // Use default value
-                                       $GLOBALS['compile_config'][$matches[1][$key]] = getConfig('DEFAULT_' . strtoupper($matches[1][$key]));
-                               } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
-                                       // No config, try the language system
-                                       $GLOBALS['compile_config'][$matches[1][$key]] = getMessage('DEFAULT_' . strtoupper($matches[1][$key]));
-                               } else {
-                                       // Unhandled!
-                                       $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
-                               }
-                       } // END - if
+                               // Use this for replacing
+                               $code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
+                               //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
+                       } // END - foreach
+               } // END - if
 
-                       // Use this for replacing
-                       $code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
-                       //* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
-               } // END - foreach
+               // Add it to cache
+               $GLOBALS['compiled_config'][$uncompiled] = $code;
+       } // END - if
+
+       // Should we compile it?
+       if ($compiled === true) {
+               // Run the code
+               eval("\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";");
        } // END - if
 
        // Return compiled code
-       return $code;
+       return $GLOBALS['compiled_config'][$uncompiled];
 }
 
 // Filter for compiling extension data
@@ -705,7 +717,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
        // Is the extension 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), getUserId(), ''));
+               setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
        } else {
                // Generate weak (!!!) code
                setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -832,5 +844,17 @@ function FILTER_DISPLAY_PARSING_TIME () {
        } // END - if
 }
 
+// Filter for flushing template cache
+function FILTER_FLUSH_TEMPLATE_CACHE () {
+       // Do we have cached eval() data?
+       if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) {
+               // Now flush all
+               foreach ($GLOBALS['template_eval'] as $template=>$eval) {
+                       // Flush the cache (if not yet found)
+                       flushTemplateCache($template, $eval);
+               } // END - if
+       } // END - if
+}
+
 // [EOF]
 ?>