Even more usage of EL

[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 1b1dd1984c29df084f31ad63e4dd97a93faa967c..528c6e57cd9a010408059d63cbb664abf10ee178 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -122,7 +122,7 @@ LIMIT 1",
                } // END - if
 
                // And shall I check that his URL is not in the black list?
-               if (getConfig('url_blacklist') == 'Y') {
+               if (isUrlBlaskEnabled()) {
                        // 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(postRequestParameter('url')), __FILE__, __LINE__);
@@ -203,12 +203,10 @@ WHERE
        d.receive_mails > 0
        ".$add."
 ORDER BY
-       d.%s %s",
+       d.{?order_select?} {?order_mode?}",
                        array(
                                bigintval(postRequestParameter('cat')),
-                               getMemberId(),
-                               getConfig('order_select'),
-                               getConfig('order_mode'),
+                               getMemberId()
                        ), __FILE__, __LINE__);
 
                // Do we enougth receivers left?
@@ -250,7 +248,10 @@ LIMIT 1",
 
                        // Update receiver list
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
-                               array(convertReceivers($receiver), $content['target_send']), __FILE__, __LINE__);
+                               array(
+                                       convertReceivers($receiver),
+                                       $content['target_send']
+                               ), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
                        if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));