New functions introduced, several rewrites:

[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 a73cc895449baaa6c36b9a870278fdab428ec4db..31b3327451e880c587e932ce29e6174772e2e583 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -61,15 +61,21 @@ if (isAdmin()) $whereStatement = '';
 $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 
 // Do we have ext-holiday installed?
-$HOLIDAY = 'serid';
+// @TODO Rewrite this to a filter
+$HOLIDAY = 'userid';
 if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
        // Fetch also holiday activation data
        $HOLIDAY = 'holiday_active';
 } // END - if
 
-$result_mmails = SQL_QUERY_ESC("SELECT `userid`, `receive_mails`, `mail_orders`, `".$HOLIDAY."`
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `userid`=%s AND `max_mails` > 0 LIMIT 1",
+$result_mmails = SQL_QUERY_ESC("SELECT
+       `userid`, `receive_mails`, `mail_orders`, `".$HOLIDAY."`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `userid`=%s AND
+       `max_mails` > 0
+LIMIT 1",
        array(getMemberId()), __FILE__, __LINE__);
 
 $mmails = SQL_NUMROWS($result_mmails);
@@ -265,14 +271,14 @@ LIMIT 1",
                        SQL_FREERESULT($result);
 
                        // Implode array into string for the sending pool
-                       $RECEIVER = implode($TEST, ';');
+                       $receiver = implode($TEST, ';');
 
                        // Count array for maximum sent
                        $content['target_send'] = count($TEST);
 
                        // 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'] > postRequestElement('receiver')) $content['target_send'] = bigintval(postRequestElement('receiver'));
@@ -297,7 +303,7 @@ LIMIT 1",
                                                                getMemberId(),
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
-                                                               $RECEIVER,
+                                                               $receiver,
                                                                bigintval(postRequestElement('type')),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
@@ -313,7 +319,7 @@ LIMIT 1",
                                                                getMemberId(),
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
-                                                               $RECEIVER,
+                                                               $receiver,
                                                                bigintval(postRequestElement('type')),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
@@ -344,7 +350,7 @@ LIMIT 1",
                                                        array(
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
-                                                               $RECEIVER,
+                                                               $receiver,
                                                                bigintval(postRequestElement('type')),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
@@ -373,7 +379,7 @@ LIMIT 1",
                                                        array(
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
-                                                               $RECEIVER,
+                                                               $receiver,
                                                                bigintval(postRequestElement('type')),
                                                                postRequestElement('url'),
                                                                bigintval(postRequestElement('cat')),
@@ -552,7 +558,7 @@ LIMIT 1",
 
                                        default: // Unknown/invalid
                                                logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
-                                               $content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN'), getConfig('order_max_full'));
+                                               $content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN');
                                                break;
                                } // END - switch
 
@@ -643,7 +649,7 @@ LIMIT 1",
                                        $add = '';
                                        if (isExtensionActive('html_mail')) {
                                                // Add some content when html extension is active
-                                               if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "<tr><td colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</td></tr>\n";
+                                               if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "<tr><td colspan=\"2\" class=\"seperator bottom\" height=\"5\">&nbsp;</td></tr>\n";
                                                $content['html_extension'] = loadTemplate('member_order-html_intro', true);
                                        } else {
                                                // No HTML extension installed
@@ -690,7 +696,7 @@ LIMIT 1",
        loadTemplate('admin_settings_saved', false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
 } else {
        // Please confirm some mails first
-       loadTemplate('admin_settings_saved', false, sprintf(getMessage('MEMBER_LINKS_LEFT'), $links, getConfig('unconfirmed')));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
 }
 
 if (!empty($URL)) {