Mailer project continued:

[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 1180b53707d866c478b8926d5244ab6440d3970d..8914ad5202f5f25d3ccdba8785d88a8507a966ac 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -120,21 +120,9 @@ LIMIT 1",
                } // END - if
 
                // And shall I check that his URL is not in the black list?
-               if (isUrlBlacklistEnabled()) {
-                       // Ok, I do that for you know...
-                       $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`timestamp`) AS tstamp FROM `{?_MYSQL_PREFIX?}_url_blacklist` WHERE `url`='%s' LIMIT 1",
-                               array(postRequestElement('url')), __FILE__, __LINE__);
-
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Jupp, we got one listed
-                               list($blist) = SQL_FETCHROW($result);
-
-                               // Create redirect-URL
-                               $url = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $blist;
-                       } // END - if
-
-                       // Free result
-                       SQL_FREERESULT($result);
+               if (isUrlBlacklisted(postRequestElement('url'))) {
+                       // Create redirect-URL
+                       $url = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $GLOBALS['blacklist_data'][postRequestElement('url')]['timestamp'];
                } // END - if
 
                // Enougth receivers entered?
@@ -552,7 +540,7 @@ LIMIT 1",
                        SQL_FREERESULT($result_cats);
 
                        // Now we need to load the mail types...
-                       $result = SQL_QUERY("SELECT `id`,`price`,`payment`,`mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
+                       $result = SQL_QUERY("SELECT `id`, `price`, `payment`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
 
                        $types = array();
                        if (!SQL_HASZERONUMS($result)) {