A lot more wrapper functions introduced, TODOs.txt updated

[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 1059d778a1fffc0fc946ad6cf5a98411a07a442f..4a5a4ef831cb6787c6c2b83c90461105eacfca54 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('order')) && (!isAdmin())) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
@@ -120,7 +120,7 @@ LIMIT 1",
                } // END - if
 
                // And shall I check that his URL is not in the black list?
-               if (isUrlBlaskEnabled()) {
+               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(postRequestParameter('url')), __FILE__, __LINE__);
@@ -210,7 +210,7 @@ ORDER BY
                // Do we enougth receivers left?
                if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
                        // Load receivers from database
-                       $TEST = array(); $cnt = '0';
+                       $TEST = array(); $count = '0';
                        while ($holidayContent = SQL_FETCHARRAY($result)) {
                                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                        // Check for his holiday status
@@ -231,7 +231,7 @@ LIMIT 1",
                                if ($holidayContent['userid'] > 0) {
                                        // Add receiver
                                        $TEST[] = $holidayContent['userid'];
-                                       $cnt++;
+                                       $count++;
                                } // END - if
                        } // END - while
 
@@ -387,11 +387,11 @@ LIMIT 1",
                                // No enougth points left!
                                $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS');
                        }
-               } else  {
+               } else {
                        // Ordered more mails than he can send in this category
                        $url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
                }
-       }
+       } // END - if
 } elseif (postRequestParameter('receiver') == '0') {
        // Not enougth receivers selected
        $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
@@ -441,7 +441,7 @@ ORDER BY
                                        array(bigintval($categoriesContent['id']), getMemberId()), __FILE__, __LINE__);
 
                                $userid_cnt = '0';
-                               while (list($ucat) = SQL_FETCHROW($result_userids)) {
+                               while (list($userid) = SQL_FETCHROW($result_userids)) {
                                        // Check for holiday system
                                        $isHolidayActive = false;
                                        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
@@ -462,28 +462,28 @@ WHERE
        h.holiday_start < UNIX_TIMESTAMP() AND
        h.holiday_end > UNIX_TIMESTAMP()
 LIMIT 1",
-                                                       array(bigintval($ucat)), __FILE__, __LINE__);
+                                                       array(bigintval($userid)), __FILE__, __LINE__);
 
                                                // Fetch entry
-                                               list($cnt) = SQL_FETCHROW($result);
+                                               list($count) = SQL_FETCHROW($result_holiday);
 
                                                // Free memory
                                                SQL_FREERESULT($result_holiday);
 
                                                // Is holiday is active?
-                                               $isHolidayActive = ($cont == 1);
+                                               $isHolidayActive = ($count == 1);
                                        } // END - if
 
                                        if ($isHolidayActive === false) {
                                                // Check if the user want's to receive mails?
                                                $result_ver = SQL_QUERY_ESC("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s".$HTML." AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
-                                                       array(bigintval($ucat)), __FILE__, __LINE__);
+                                                       array(bigintval($userid)), __FILE__, __LINE__);
 
                                                if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
                                                        // Get zip code
                                                        list($zip) = SQL_FETCHROW($result_ver);
                                                        if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
-                                                               // Ok, ZIP part is found
+                                                               // Ok, ZIP code part is found
                                                                $userid_cnt++;
                                                        } // END - if
                                                } else {
@@ -526,7 +526,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Output user's points
-                               $content['total'] = translateComma($total);
+                               $content['total'] = $total;
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
                                switch (getConfig('order_max_full')) {
@@ -579,7 +579,7 @@ LIMIT 1",
                                } else {
                                        // Default output for that your members don't forget it...
                                        $content['url']         = 'http://';
-                                       $content['target_send'] = getConfig('order_min');
+                                       $content['target_send'] = '{?order_min?}';
                                        $content['subject']     = '{--ORDER_DEFAULT_SUBJECT--}';
                                        $content['text']        = '{--ORDER_DEFAULT_TEXT--}';
                                }
@@ -599,12 +599,11 @@ LIMIT 1",
                                        // Mail type
                                        $content['type_selection'] = '';
                                        foreach ($types as $key => $value) {
-                                               $P = translateComma($types[$key][1]);
                                                if (is_array($value)) {
                                                        // Output option line
                                                        $content['type_selection'] .= '      <option value="' . $types[$key][0] . '"';
                                                        if (($OLD_ORDER) && ($content['payment_id'] == $types[$key][0])) $content['type_selection'] .= ' selected="selected"';
-                                                       $content['type_selection'] .= '>' . $P . ' {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
+                                                       $content['type_selection'] .= '>{%pipe,translateComma=' . $types[$key][1] . '%} {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
                                                } // END - if
                                        } // END - foreach
 
@@ -672,7 +671,7 @@ LIMIT 1",
        }
 } else {
        // Please confirm some mails first
-       loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
+       loadTemplate('admin_settings_saved', false, '<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
 }
 
 if (!empty($url)) {