Fix for previous commit

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 73e88c6ce05cef02ac10234a892621d043043ae8..36212e608afb78e07ef483e34214809f9e596ff6 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -433,9 +433,6 @@ function detectExtraTemplatePath ($template) {
 
 // Loads an email template and compiles it
 function loadEmailTemplate ($template, $content = array(), $userid = NULL, $loadUserData = true) {
-       // @TODO $DATA is deprecated and should be avoided and replaced with $content
-       global $DATA;
-
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
@@ -516,8 +513,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
 <div class="para">
        {--TEMPLATE_CONTENT--}:
        <pre>' . print_r($content, true) . '</pre>
-       {--TEMPLATE_DATA--}:
-       <pre>' . print_r($DATA, true) . '</pre>
 </div>';
 
                // Debug mode not active? Then remove the HTML tags
@@ -541,7 +536,6 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
 
        // Remove content and data
        unset($content);
-       unset($DATA);
 
        // Return content
        return $newContent;
@@ -598,7 +592,7 @@ function compileCode ($code, $simple = false, $constants = true, $full = true, $
        return $code;
 }
 
-// Compiles the code (use compileCode() only for HTML because of the comments)
+// Compiles the code
 // @TODO $simple/$constants are deprecated
 function compileRawCode ($code, $simple = false, $constants = true, $full = true, $compileCode = true) {
        // Is the code a string or shall we not compile?
@@ -625,8 +619,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
        $code = str_replace($secChars['to'], $secChars['from'], $code);
 
        // Find $content[bla][blub] entries
-       // @TODO Do only use $content and deprecate $DATA in templates
-       preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
+       preg_match_all('/\$content((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
 
        // Are some matches found?
        if ((count($matches) > 0) && (count($matches[0]) > 0)) {
@@ -657,12 +650,12 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
                        } // END - if
 
                        // Take all string elements
-                       if ((is_string($matches[4][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[4][$key]]))) {
+                       if ((is_string($matches[3][$key])) && (!isset($matchesFound[$match])) && (!isset($matchesFound[$key.'_' . $matches[3][$key]]))) {
                                // Replace it in the code
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key . ',match=' . $match);
                                $newMatch = str_replace('[', "['", str_replace(']', "']", $match));
                                $code = str_replace($match, '".' . $newMatch . '."', $code);
-                               $matchesFound[$key . '_' . $matches[4][$key]] = 1;
+                               $matchesFound[$key . '_' . $matches[3][$key]] = 1;
                                $matchesFound[$match] = true;
                        } elseif (!isset($matchesFound[$match])) {
                                // Not yet replaced!
@@ -1236,7 +1229,9 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 // Compile characters which are allowed in URLs
 function compileUriCode ($code, $simple = true) {
        // Compile constants
-       if ($simple === false) $code = str_replace('{--', '".', str_replace('--}', '."', $code));
+       if ($simple === false) {
+               $code = str_replace('{--', '".', str_replace('--}', '."', $code));
+       } // END - if
 
        // Compile QUOT and other non-HTML codes
        $code = str_replace('{DOT}', '.',
@@ -1257,6 +1252,7 @@ function compileUriCode ($code, $simple = true) {
 
 // Handle message codes from URL
 function handleCodeMessage () {
+       // Is 'code' set?
        if (isGetRequestParameterSet('code')) {
                // Default extension is 'unknown'
                $ext = 'unknown';