Naming inconsistencies for userid fixed

[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 f7f6049d476c639335c05301b4b41911a7b90475..a9b269896d66e50e85eefbe9cd9f84a791b98c4e 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -57,11 +57,8 @@ $whereStatement = " WHERE `visible`='Y'";
 // Set undefined array elements
 if (isAdmin()) $whereStatement = '';
 
-// Minimum mails / order
-$content['min'] = getConfig('order_min');
-
 // Count unconfirmed mails
-$links = countSumTotalData(getUserId(), 'user_links', 'id', 'userid', true);
+$links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
 
 // Do we have ext-holiday installed?
 $HOLIDAY = 'serid';
@@ -73,7 +70,7 @@ if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3'
 $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(getUserId()), __FILE__, __LINE__);
+       array(getMemberId()), __FILE__, __LINE__);
 
 $mmails = SQL_NUMROWS($result_mmails);
 list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
@@ -88,7 +85,7 @@ $ALLOWED = $MAXI - $ORDERS;
 if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 
 // Now check his points amount
-$total = countSumTotalData(getUserId(), 'user_points', 'points') - countSumTotalData(getUserId(), 'user_data', 'used_points');;
+$total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');;
 
 if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
        // Holiday is active!
@@ -106,7 +103,7 @@ WHERE
        `timestamp` > (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
                array(
-                       getUserId(),
+                       getMemberId(),
                        postRequestElement('url'),
                        getConfig('url_tlock')
                ), __FILE__, __LINE__);
@@ -224,7 +221,7 @@ ORDER BY
        d.%s %s",
                        array(
                                bigintval(postRequestElement('cat')),
-                               getUserId(),
+                               getMemberId(),
                                getConfig('order_select'),
                                getConfig('order_mode'),
                        ), __FILE__, __LINE__);
@@ -297,7 +294,7 @@ LIMIT 1",
                                                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',UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
                                                        array(
-                                                               getUserId(),
+                                                               getMemberId(),
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
                                                                $RECEIVER,
@@ -313,7 +310,7 @@ LIMIT 1",
                                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_pool` (`sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `zip`)
  VALUES ('%s','%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
                                                        array(
-                                                               getUserId(),
+                                                               getMemberId(),
                                                                postRequestElement('subject'),
                                                                postRequestElement('text'),
                                                                $RECEIVER,
@@ -387,12 +384,12 @@ LIMIT 1",
                                        }
                                }
 
-                               // Do we need to get the ID number?
+                               // Do we need to get the id number?
                                if ($id == 0) {
                                        // Order is placed as temporary. We need to get it's id for the frametester
                                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `sender`=%s AND `subject`='%s' AND `payment_id`=%s AND `data_type`='TEMP' AND `timestamp`=UNIX_TIMESTAMP() LIMIT 1",
                                                array(
-                                                       getUserId(),
+                                                       getMemberId(),
                                                        postRequestElement('subject'),
                                                        bigintval(postRequestElement('type'))
                                                ), __FILE__, __LINE__);
@@ -404,7 +401,7 @@ LIMIT 1",
                                        SQL_FREERESULT($result);
                                } // END - if
 
-                               // ID is received so we can redirect the user, used points will be added when he send's out the mail
+                               // id is received so we can redirect the user, used points will be added when he send's out the mail
                                $URL = 'modules.php?module=frametester&order=' . $id;
                        } elseif ($content['target_send'] == 0) {
                                // Not enougth receivers found which can receive mails
@@ -418,7 +415,7 @@ LIMIT 1",
                        $URL = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
                }
        }
-} elseif (postRequestElement('receiver') == 0) {
+} elseif (postRequestElement('receiver') == '0') {
        // Not enougth receivers selected
        $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == 0) && (getConfig('order_max_full') == 'ORDER')) {
@@ -458,7 +455,7 @@ ORDER BY
 
                                // Select users in current category
                                $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != '%s' ORDER BY `userid` ASC",
-                                       array(bigintval($categoriesContent['id']), getUserId()), __FILE__, __LINE__);
+                                       array(bigintval($categoriesContent['id']), getMemberId()), __FILE__, __LINE__);
 
                                $userid_cnt = 0;
                                while (list($ucat) = SQL_FETCHROW($result_userids)) {
@@ -473,8 +470,12 @@ LEFT JOIN
 ON
        d.userid=h.userid
 WHERE
-       d.userid=%s AND d.receive_mails > 0 AND d.`status`='CONFIRMED' AND d.`holiday_active`='Y' AND
-       h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()
+       d.userid=%s AND
+       d.receive_mails > 0 AND
+       d.`status`='CONFIRMED' AND
+       d.`holiday_active`='Y' AND
+       h.holiday_start < UNIX_TIMESTAMP() AND
+       h.holiday_end > UNIX_TIMESTAMP()
 LIMIT 1",
                                                        array(bigintval($ucat)), __FILE__, __LINE__);
 
@@ -520,7 +521,7 @@ LIMIT 1",
 
                        $types = array();
                        if (SQL_NUMROWS($result) > 0) {
-                               // Check for message ID in URL
+                               // Check for message id in URL
                                $message = getMessageFromErrorCode(getRequestElement('code'));
 
                                if (!empty($message)) {
@@ -573,7 +574,7 @@ WHERE
        `sender`=%s AND
        `data_type`='TEMP'
 LIMIT 1",
-                                       array(getUserId()), __FILE__, __LINE__);
+                                       array(getMemberId()), __FILE__, __LINE__);
 
                                if (SQL_NUMROWS($result) == 1) {
                                        // Old order found
@@ -590,7 +591,7 @@ LIMIT 1",
                                } else {
                                        // Default output for that your members don't forget it...
                                        $content['url']         = 'http://';
-                                       $content['target_send'] = $content['min'];
+                                       $content['target_send'] = getConfig('order_min');
                                        $content['subject']     = '{--ORDER_DEFAULT_SUBJECT--}';
                                        $content['text']        = '{--ORDER_DEFAULT_TEXT--}';
                                }