From d36d67adb800513d9293a897bef1ee09db6b3583 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 6 Nov 2009 17:39:37 +0000 Subject: [PATCH] Fix for 'empty version' and eval-ed the email again --- inc/functions.php | 14 ++++++++++---- inc/mysql-manager.php | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index dc31759fc8..023cc7d2be 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -529,7 +529,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = ' //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):TO={$toEmail},SUBJECT={$subject}
"); // 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 4b7d94ccc4..bc2ccddadf 100644 --- 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 -- 2.30.2