final fix for banner loader

[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..58b69a2fd9ca8750ea635a2e4298969f76685b5c 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;
@@ -991,9 +992,12 @@ function MAKE_TIME($H, $M, $S, $stamp)
        return mktime($H, $M, $S, $MONTH, $DAY, $YEAR);
 }
 //
-function LOAD_URL($URL) {
+function LOAD_URL($URL, $addUrlData=true) {
+       // Compile out URI codes
+       $URL = COMPILE_CODE($URL);
+
        // Add some data to URL if cookies are not accepted
-       if ((!defined('__COOKIES')) || (!__COOKIES)) $URL = ADD_URL_DATA($URL);
+       if ((!defined('__COOKIES')) || (!__COOKIES) && ($addUrlData)) $URL = ADD_URL_DATA($URL);
 
        // Probe for bot from search engine
        if ((eregi("spider", getenv('HTTP_USER_AGENT'))) || (eregi("bot", getenv('HTTP_USER_AGENT'))) || (eregi("spider", getenv('HTTP_USER_AGENT')))) {
@@ -1993,23 +1997,28 @@ function ADD_URL_DATA($URL)
 {
        global $_GET, $CONFIG;
        $ADD = "";
+
+       // Determine URL binder
+       $BIND = "?";
+       if (strpos($URL, "?") !== false) $BIND = "&";
+
        if ((!defined('__COOKIES')) || ((!__COOKIES))) {
                // Cookies are not accepted
                if ((!empty($_GET['refid'])) && (strpos($URL, "refid=") == 0)) {
                        // Cookie found in URL
-                       $ADD .= "&refid=".bigintval($_GET['refid']);
+                       $ADD .= $BIND."refid=".bigintval($_GET['refid']);
                } elseif ((GET_EXT_VERSION("sql_patches") != "") && ($CONFIG['def_refid'] > 0)) {
                        // Not found! So let's set default here
-                       $ADD .= "&refid=".$CONFIG['def_refid'];
+                       $ADD .= $BIND."refid=".$CONFIG['def_refid'];
                }
 
                // Add session ID
                if ((!empty($_GET['PHPSESSID'])) && (strpos($URL, "PHPSESSID=") == 0)) {
                        // Add session from URL
-                       $ADD .= "&PHPSESSID=".SQL_ESCAPE(strip_tags($_GET['PHPSESSID']));
+                       $ADD .= $BIND."PHPSESSID=".SQL_ESCAPE(strip_tags($_GET['PHPSESSID']));
                } else {
                        // Add current session
-                       $ADD .= "&PHPSESSID=".session_id();
+                       $ADD .= $BIND."PHPSESSID=".session_id();
                }
        }