Fix for broken emails... :(

diff --git a/inc/expression-functions.php b/inc/expression-functions.php
index b1a31c4a0f57a6e476ec6d4826684b93131e5006..c8129ddb21dc2072b52edb1ff0b8cff43c2481f0 100644 (file)
--- a/inc/expression-functions.php
+++ b/inc/expression-functions.php
@@ -168,7 +168,7 @@ function doExpressionConfig ($data) {
        // Do we have a special expression function for it?
        if (isExpressionFunctionAvaiable($data)) {
                // Then use it
-               $replacer = '{DQUOTE}  . ' . $data['callback'] . '('.getExpressionFunction($data).'(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';
+               $replacer = '{DQUOTE}  . ' . $data['callback'] . '(' . getExpressionFunction($data) . '()) . {DQUOTE}';
        } else {
                // Default replacer is the config value itself
                $replacer = '{DQUOTE}  . ' . $data['callback'] . '(getConfig(' . "'" . $data['matches'][4][$data['key']] . "'" . ')) . {DQUOTE}';

diff --git a/inc/functions.php b/inc/functions.php
index 00cfe3b84c78f40ea3a1714f1f5209f68bbf7dae..9f3bf52436c76c115dd85151314abbcb292b410d 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -181,12 +181,12 @@ function checkPhpMailerUsage() {
 // Send out a raw email with PHPMailer class or legacy mail() command
 function sendRawEmail ($toEmail, $subject, $message, $headers) {
        // Just compile all to put out all configs, etc.
-       $eval  = '$toEmail = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($toEmail)), false) . '"); ';
-       $eval .= '$subject = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($subject)), false) . '"); ';
-       $eval .= '$headers = decodeEntities("' . doFinalCompilation(compileRawCode(escapeQuotes($headers)), false) . '"); ';
+       $eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); ';
+       $eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); ';
+       $eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), false)) . '"); ';
 
        // Do not decode entities in the message because we also send HTML mails through this function
-       $eval .= '$message = "' . doFinalCompilation(compileRawCode(escapeQuotes($message)), false) . '";';
+       $eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";';
 
        // Run the final eval() command
        eval($eval);

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 4086492753c43731870cf2d2198a478800be9d07..65e73d005a3091160decbaf67ea6e146791f7d4e 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -226,8 +226,9 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
                // Compile it
                //* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
                $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
-               //* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
+               //* DEBUG: */ if (!$insertComments) print('EVAL=<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
+               //* DEBUG: */ if (!$insertComments) print('NEW=<pre>'.linenumberCode($newContent).'</pre>');
                //* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
 
                // Was that eval okay?