Missing URL blacklist tabled (re-)added

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index eace0213cbae9e80d58104fab8836a8cd6b47a9a..7753510fa860a5ea7f1053b07e8f63f46be0c1d8 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -84,9 +84,6 @@ if ($HOLIDAY == $DMY) $HOLIDAY='N';
 $ALLOWED = $MAXI - $ORDERS;
 if (getConfig('order_max_full') == "MAX") $ALLOWED = $MAXI;
 
-// Check HTML extension
-$HTML_EXT = EXT_IS_ACTIVE("html_mail");
-
 // Now check his points amount
 $TOTAL = GET_TOTAL_DATA($GLOBALS['userid'], "user_points", "points");
 
@@ -153,15 +150,19 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                // And shall I check that his URL is not in the black list?
                if (getConfig('url_blacklist') == "Y") {
                        // Ok, I do that for you know...
-                       $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_url_blist WHERE url='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `"._MYSQL_PREFIX."_url_blacklist` WHERE `url`='%s' LIMIT 1",
                                array($_POST['url']), __FILE__, __LINE__);
 
                        if (SQL_NUMROWS($result) == 1) {
                                // Jupp, we got one listed
                                list($blist) = SQL_FETCHROW($result);
-                               SQL_FREERESULT($result);
+
+                               // Create redirect-URL
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
                        } // END - if
+
+                       // Free result
+                       SQL_FREERESULT($result);
                } // END - if
 
                // Enougth receivers entered?
@@ -177,7 +178,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                } // END - if
 
                // Probe for HTML extension
-               if ($HTML_EXT) {
+               if (EXT_IS_ACTIVE("html_mail")) {
                        // HTML or regular text mail?
                        if ($_POST['html'] == "Y") {
                                // Chek for valid HTML tags
@@ -276,7 +277,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                                if (($id == "0") || ($type != "TEMP")) {
                                        // New order
                                        $id = 0;
-                                       if ($HTML_EXT) {
+                                       if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",
@@ -312,7 +313,7 @@ array(
                                        }
                                } else {
                                        // Change current order
-                                       if ($HTML_EXT) {
+                                       if (EXT_IS_ACTIVE("html_mail")) {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
 subject='%s',
@@ -414,7 +415,7 @@ array(
 
                        // Enable HTML checking
                        $HTML = ""; $HOLIDAY = false; $HOL_STRING = "";
-                       if (($HTML_EXT) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'";
+                       if ((EXT_IS_ACTIVE("html_mail")) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'";
                        if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                                // Extension's version is fine
                                $HOLIDAY = true; $HOL_STRING = " AND holiday_active='N'";
@@ -624,7 +625,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                }
 
                                // 01      2              21    12                                   2    23         443    3          3210
-                               if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') == "N") && ((!IS_ADMIN()) && (!$HTML_EXT)))) {
+                               if ((!empty($_POST['data'])) || ((getConfig('order_multi_page') == "N") && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE("html_mail"))))) {
                                        // Pre-output categories
                                        $CAT = "";
                                        foreach ($CATS['id'] as $key => $value) {
@@ -661,7 +662,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        }
 
                                        // HTML extension
-                                       if (($HTML_EXT) && ($_POST['html'] == "Y")) {
+                                       if ((EXT_IS_ACTIVE("html_mail")) && ($_POST['html'] == "Y")) {
                                                // Extension is active so output valid HTML tags
                                                define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS()));
                                        } else {
@@ -674,7 +675,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                } else {
                                        // Remember maybe entered ZIP code in constant
                                        $ADD = "";
-                                       if ($HTML_EXT) {
+                                       if (EXT_IS_ACTIVE("html_mail")) {
                                                // Add some content when html extension is active
                                                if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
                                                define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));