Fix for loading referral banner

[mailer.git] / 0.2.1 / inc / functions.php

diff --git a/0.2.1/inc/functions.php b/0.2.1/inc/functions.php
index 7088c4c07cc78948642fc5f35661907920f67006..c22b12fb63e4b81d91105de19598eef3d02795e1 100644 (file)
--- a/0.2.1/inc/functions.php
+++ b/0.2.1/inc/functions.php
@@ -430,7 +430,7 @@ Message : ".$MSG."
 // Check if legacy or PHPMailer command
 // @private
 function CHECK_PHPMAILER_USAGE() {
-       return (((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD'))) || ((SMTP_HOSTNAME != "") && (SMTP_USER != "")));
+       return ((defined('SMTP_HOSTNAME')) && (defined('SMTP_USER')) && (defined('SMTP_PASSWORD')) && (SMTP_HOSTNAME != "") && (SMTP_USER != ""));
 }
 
 /*
@@ -445,6 +445,7 @@ function SEND_RAW_EMAIL ($to, $subject, $msg, $from) {
 
                // get new instance
                $mail = new PHPMailer();
+               $mail->PluginDir  = PATH."inc/phpmailer/";
 
                $mail->IsSMTP();
                $mail->SMTPAuth   = true;
@@ -992,6 +993,9 @@ function MAKE_TIME($H, $M, $S, $stamp)
 }
 //
 function LOAD_URL($URL) {
+       // Compile out URI codes
+       $URL = COMPILE_URI_CODE($URL);
+
        // Add some data to URL if cookies are not accepted
        if ((!defined('__COOKIES')) || (!__COOKIES)) $URL = ADD_URL_DATA($URL);