Fix for 'empty version' and eval-ed the email again

diff --git a/inc/functions.php b/inc/functions.php
index dc31759fc8479eee9c9f1b4719ba81aec2a0f2a1..023cc7d2be924732c9fd1829bd27b80354ba0b23 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -529,7 +529,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        //* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):TO={$toEmail},SUBJECT={$subject}<br />");
 
        // Compile subject line (for POINTS constant etc.)
-       eval("\$subject = decodeEntities(\"".compileCode(escapeQuotes($subject))."\");");
+       eval("\$subject = decodeEntities(\"".compileRawCode(escapeQuotes($subject))."\");");
 
        // Set from header
        if ((!eregi('@', $toEmail)) && ($toEmail > 0)) {
@@ -575,10 +575,10 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        }
 
        // Compile "TO"
-       eval("\$toEmail = \"".compileCode(escapeQuotes($toEmail))."\";");
+       eval("\$toEmail = \"".compileRawCode(escapeQuotes($toEmail))."\";");
 
        // Compile "MSG"
-       eval("\$message = \"".compileCode(escapeQuotes($message))."\";");
+       eval("\$message = \"".compileRawCode(escapeQuotes($message))."\";");
 
        // Fix HTML parameter (default is no!)
        if (empty($isHtml)) $isHtml = 'N';
@@ -602,7 +602,7 @@ Message : ' . $message . '
        }
 }
 
-// Check if legacy or PHPMailer command
+// Check to use wether legacy mail() command or PHPMailer class
 // @TODO Rewrite this to an extension 'smtp'
 // @private
 function checkPhpMailerUsage() {
@@ -611,6 +611,12 @@ function checkPhpMailerUsage() {
 
 // Send out a raw email with PHPMailer class or legacy mail() command
 function sendRawEmail ($toEmail, $subject, $message, $from) {
+       // Just compile all again, to put out all configs, etc.
+       eval('$toEmail = decodeEntities("' . compileCode(escapeQuotes($toEmail)) . '");');
+       eval('$subject = decodeEntities("' . compileCode(escapeQuotes($subject)) . '");');
+       eval('$message = decodeEntities("' . compileCode(escapeQuotes($message)) . '");');
+       eval('$from    = decodeEntities("' . compileCode(escapeQuotes($from))    . '");');
+
        // Shall we use PHPMailer class or legacy mode?
        if (checkPhpMailerUsage()) {
                // Use PHPMailer class with SMTP enabled

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 4b7d94ccc4e2b8f2f939c4139a0afc07a45fc577..bc2ccddadf095d4718a0f10feb9815586c4324f9 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1733,7 +1733,7 @@ WHERE
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s", array(bigintval($userid)), __FUNCTION__, __LINE__);
 
                // Update mediadata as well
-               if (getExtensionVersion('mediadata') >= '0.0.4') {
+               if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
                        // Update database
                        updateMediadataEntry(array('total_points'), 'sub', $points);
                } // END - if