Global rewrite of engine:

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index 79462da8d7b9c5242b0710b9cf02ca3f9c71bc11..362898e490a2fed3cdd501be98da9be6cfd72f80 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -414,7 +414,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
                                                $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]) . "').\"";
+                                               $GLOBALS['compile_config'][$matches[1][$key]] = "\" . getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "') . \"";
                                        } else {
                                                // Unhandled!
                                                $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
@@ -435,7 +435,7 @@ function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
        if ($compiled === true) {
                // Run the code
                $eval = "\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";";
-               //* DEBUG: */ print '<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>';
+               //* DEBUG: */ print('<pre>' . str_replace('$', '&#36;', htmlentities($eval)) . '</pre>');
                eval($eval);
        } // END - if
 
@@ -448,34 +448,54 @@ function FILTER_COMPILE_EXTENSION ($code) {
        // Compile {%cmd=some_value%} to get extension data
        // Support cmd is:
        //   - version -> getExtensionVersion() call
-       preg_match_all('/\{%((([a-zA-Z0-9-_]+)=([a-zA-Z0-9-_]+))*)\%\}/', $code, $matches);
+       preg_match_all('/\{%(([a-zA-Z0-9-_,]+)=([^%\}]+))%\}/', $code, $matches);
+       //* DEBUG: */ print('<pre>'.print_r($matches, true).'</pre>');
+
+       // Default is from OUTPUT_HTML
+       $outputMode = getOutputMode();
 
        // Some entries found?
        if ((count($matches) > 0) && (count($matches[3]) > 0)) {
                // Replace all matches
-               foreach ($matches[3] as $key => $cmd) {
+               foreach ($matches[2] as $key => $cmd) {
                        // Init replacer variable
                        $replacer = '';
 
                        // Is the extension installed or code provided?
+                       // @TODO This whole if-block is very static
                        if ($cmd == 'code') {
                                // Code asked for
-                               $replacer = "\".getCode(\"" . $matches[4][$key] . "\").\"";
+                               $replacer = "\" . getCode('" . $matches[3][$key] . "') . \"";
+                       } elseif (substr($cmd, 0, 3) == 'url') {
+                               // Do we have JS-mode?
+                               if (substr($cmd, -2, 2) == 'js') $outputMode = 1;
+
+                               // Handle an URL here
+                               $replacer = "\" . encodeUrl('" . $matches[3][$key] . "', " . $outputMode . ") . \"";
+
+                               // Replace it
+                               $code = str_replace($matches[0][$key], $replacer, $code);
+
+                               // And continue with next entry
+                               continue;
                        } else {
                                // Construct call-back function name
                                $functionName = 'getExtension' . ucfirst(strtolower($cmd));
 
                                // Construct call of the function
-                               $replacer = "\".call_user_func_array('" . $functionName . "', array('" . $matches[4][$key] . "', true)).\"";
+                               $replacer = "\" . call_user_func_array('" . $functionName . "', array('" . $matches[3][$key] . "', true)) . \"";
                        }
 
                        // Replace it and insert parameter for GET request
-                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\".getConfig('CURR_SVN_REVISION').\"", $cmd, $replacer), $code);
+                       $code = str_replace($matches[0][$key], sprintf("&amp;%s=%s&amp;rev=\" . getConfig('CURR_SVN_REVISION') . \"", $cmd, $replacer), $code);
                } // END - foreach
        } // END - if
 
+       // Do we have non-HTML mode?
+       if ((getOutputMode() != '0') || ($outputMode != '0')) $code = html_entity_decode($code);
+
        // Return compiled code
-       //* DEBUG: */ die('<pre>'.secureString($code).'</pre>');
+       //* DEBUG: */ die('<pre>'.htmlentities($code).'</pre>');
        return $code;
 }