X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=f2822d0401d494caa5a735c4da1063fb6a3379ba;hp=16eb57d7a2afd0f2dee71c34f07e3ef5057c6848;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 16eb57d7a2..f2822d0401 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -48,22 +48,29 @@ if ((!isExtensionActive('order')) && (!isAdmin())) {
return;
} // END - if
-$url = ''; $id = '0';
+// Init data
+$data = array(
+ 'id' => '0',
+ 'data_type' => 'TEMP',
+ 'url' => '',
+);
$ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
-if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
+if (getOrderMaxFull() == 'MAX') $ALLOWED = getUserData('receive_mails');
// Now check his points amount
$totalPoints = getTotalPoints(getMemberId());
-if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
+// Admin can always book
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active')) && (!isAdmin())) {
// Holiday is active!
displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
} elseif ((isPostRequestElementSet('frametester')) && ($ALLOWED > 0) && (postRequestElement('receiver') > 0)) {
// Continue with the frametester, we first need to store the data temporary in the pool
//
// First we would like to store the data and get it's pool position back...
- $result = SQL_QUERY_ESC("SELECT
+ // @TODO Try to move out url_tlock to a filter for extra SQL statements
+ $result = sqlQueryEscaped("SELECT
`id`,
`data_type`
FROM
@@ -78,160 +85,99 @@ LIMIT 1",
postRequestElement('url')
), __FILE__, __LINE__);
- $type = 'TEMP'; $id = '0';
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Load id and mail type
- // @TODO Rewrite this to SQL_FETCHARRAY()
- list($id, $type) = SQL_FETCHROW($result);
+ $data = sqlFetchArray($result);
} // END - if
// Free result
- SQL_FREERESULT($result);
-
- if ($type == 'TEMP') {
- // No entry found, so we need to check out the stats table as well... :)
- // We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters
- $url = '';
- if (getConfig('allow_url_in_text') == 'Y') {
- // Test submitted text against some filters (length, URLs in text etc.)
- if ((isInStringIgnoreCase('https://', postRequestElement('text'))) || (isInStringIgnoreCase('http://', postRequestElement('text'))) || (isInStringIgnoreCase('www', postRequestElement('text')))) {
- // URL found
- $url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
- } // END - if
-
- // Remove new-line and carriage-return characters
- $TEST = str_replace(array(chr(10), chr(13)), array('', ''), postRequestElement('text'));
-
- // Text length within allowed length?
- if (strlen($TEST) > getConfig('max_tlength')) {
- // Text is too long!
- $url = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
- } // END - if
- } // END - if
-
- // Shall I test the subject line against URLs?
- if (getConfig('allow_url_in_subject') == 'Y') {
- // Check the subject line for issues
- setPostRequestElement('subject', str_replace(chr(92), '[nl]', substr(postRequestElement('subject'), 0, 200)));
- if ((isInStringIgnoreCase('https://', postRequestElement('subject'))) || (isInStringIgnoreCase('http://', postRequestElement('subject'))) || (isInStringIgnoreCase('www', postRequestElement('subject')))) {
- // URL in subject found
- $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL');
- } // END - if
- } // END - if
-
- // And shall I check that his URL is not in the black list?
- 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?
- if ((postRequestElement('receiver') < getConfig('order_min')) && (!isAdmin())) {
- // Less than allowed receivers entered!
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3');
- } // END - if
-
- // Validate URL
- if (!isUrlValid(postRequestElement('url'))) {
- // URL is invalid!
- $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
- } // END - if
-
- // Probe for HTML extension
- if (isExtensionActive('html_mail')) {
- // HTML or regular text mail?
- if (postRequestElement('html') == 'Y') {
- // Chek for valid HTML tags
- setPostRequestElement('text', checkHtmlTags(postRequestElement('text')));
-
- // Maybe invalid tags found?
- if (!isPostRequestElementSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
- } else {
- // Remove any HTML code
- setPostRequestElement('text', str_replace(array('<', '>'), array('{OPEN_HTML}', '{CLOSE_HTML}'), postRequestElement('text')));
- }
- } // END - if
-
- // Is mail type set?
- if ((!isPostRequestElementSet('mail_type')) || (postRequestElement('mail_type') < 1)) {
- // Not correctly set
- $url = 'modules.php?module=login&what=order&code=' . getCode('NO_MAIL_TYPE');
+ sqlFreeResult($result);
+
+ if ($data['data_type'] == 'TEMP') {
+ // Prepare data for filter chain
+ $filterData = array(
+ 'url' => postRequestElement('url'),
+ 'text' => postRequestElement('text'),
+ 'subject' => postRequestElement('subject'),
+ 'receiver' => bigintval(postRequestElement('receiver')),
+ 'mail_type' => bigintval(postRequestElement('mail_type')),
+ 'html' => postRequestElement('html'),
+ 'id' => bigintval($data['id']),
+ 'redirect' => '',
+ );
+
+ // Run the filter chain
+ $filterData = runFilterChain('pre_mail_order', $filterData);
+
+ // Copy field redirect->url
+ $data['url'] = $filterData['redirect'];
+
+ // Is there an error?
+ if (empty($data['url'])) {
+ // Copy all filter data -> POST
+ foreach ($filterData as $key => $value) {
+ // Set it
+ setPostRequestElement($key, $value);
+ } // END - foreach
} // END - if
} elseif (!isAdmin()) {
// He has already sent a mail within a specific time
- $url = 'modules.php?module=login&what=order&code=' . getCode('URL_TIME_LOCK') . '&id=' . $id;
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('URL_TIME_LOCK') . '&id=' . $data['id'];
}
// Still no error?
- if (empty($url)) {
+ if (empty($data['url'])) {
// Check for userids
- $result = SQL_QUERY_ESC("SELECT
- c.`userid`
+ $result = sqlQueryEscaped("SELECT
+ `c`.`userid`
FROM
- `{?_MYSQL_PREFIX?}_user_cats` AS c
+ `{?_MYSQL_PREFIX?}_user_cats` AS `c`
INNER JOIN
- `{?_MYSQL_PREFIX?}_user_data` AS d
+ `{?_MYSQL_PREFIX?}_user_data` AS `d`
ON
- c.`userid`=d.`userid`
+ `c`.`userid`=`d`.`userid`
WHERE
- c.`cat_id`=%s AND
- c.`userid` != %s AND
- d.`status`='CONFIRMED'
+ `c`.`cat_id`=%s AND
+ `c`.`userid` != %s AND
+ `d`.`status`='CONFIRMED'
" . runFilterChain('user_exclusion_sql', ' ') . " AND
- d.`receive_mails` > 0
+ `d`.`receive_mails` > 0
ORDER BY
- d.`{?order_select?}` {?order_mode?}",
+ `d`.`{?order_select?}` {?order_mode?}",
array(
bigintval(postRequestElement('cat')),
getMemberId()
), __FILE__, __LINE__);
// Are there still receivers left?
- if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
+ if (sqlNumRows($result) >= postRequestElement('receiver')) {
// Load receivers from database
- $TEST = array(); $count = '0';
- while ($holidayContent = SQL_FETCHARRAY($result)) {
- if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
- // Check for his holiday status
- $result_holiday = SQL_QUERY_ESC("SELECT
- `id`
-FROM
- `{?_MYSQL_PREFIX?}_user_holidays`
-WHERE
- `userid`=%s AND
- `holiday_start` < UNIX_TIMESTAMP() AND
- `holiday_end` > UNIX_TIMESTAMP()
-LIMIT 1",
- array($holidayContent['userid']), __FILE__, __LINE__);
- if (SQL_NUMROWS($result_holiday) == 1) {
- // Exclude user who are in holiday
- $holidayContent['userid'] = '0';
- } // END - if
-
- // Free memory
- SQL_FREERESULT($result_holiday);
- } // END - if
-
- if ($holidayContent['userid'] > 0) {
- // Add receiver
- array_push($TEST, $holidayContent['userid']);
+ $receiverArray = array(); $count = '0';
+ while ($holidayContent = sqlFetchArray($result)) {
+ // Run fetched data through pre filter chain
+ $holidayContent = runFilterChain('pre_mail_recipient_check', $holidayContent);
+
+ // Is still valid id?
+ if (isValidId($holidayContent['userid'])) {
+ // Add receiver then
+ array_push($receiverArray, $holidayContent['userid']);
$count++;
} // END - if
} // END - while
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Implode array into string for the sending pool
- $receiver = implode($TEST, ';');
+ $receivers = implode($receiverArray, ';');
// Count array for maximum sent
- $content['target_send'] = count($TEST);
+ $content['target_send'] = count($receiverArray);
// Update receiver list
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
+ sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
array(
- convertReceivers($receiver),
+ convertReceivers($receivers),
bigintval($content['target_send'])
), __FILE__, __LINE__);
@@ -241,7 +187,7 @@ LIMIT 1",
} // END - if
// Calculate used points
- $usedPoints = $content['target_send'] * getPaymentData(bigintval(postRequestElement('mail_type')));
+ $usedPoints = $content['target_send'] * getPaymentPrice(bigintval(postRequestElement('mail_type')));
// Fix empty zip code
if (!isPostRequestElementSet('zip')) {
@@ -251,183 +197,78 @@ LIMIT 1",
// Check if he has enougth points for this order and selected more than 0 receivers
if (($usedPoints > 0) && ($usedPoints <= $totalPoints) && ($content['target_send'] > 0)) {
// Gettings points is okay, so we can add $usedPoints later from
- if (($id == '0') || ($type != 'TEMP')) {
- // New order
- $id = '0';
+ if ((!isValidId($data['id'])) || ($data['data_type'] != 'TEMP')) {
+ // New order, init data array elements
+ $data = array(
+ 'sender' => getMemberId(),
+ 'subject' => postRequestElement('subject'),
+ 'text' => postRequestElement('text'),
+ 'receivers' => $receivers,
+ 'payment_id' => bigintval(postRequestElement('mail_type')),
+ 'data_type' => 'TEMP',
+ 'timestamp' => 'UNIX_TIMESTAMP()',
+ 'url' => postRequestElement('url'),
+ 'cat_id' => bigintval(postRequestElement('cat')),
+ 'target_send' => bigintval($content['target_send']),
+ 'zip' => bigintval(postRequestElement('zip'), TRUE, FALSE),
+ );
+
+ // Is ext-html_mail active?
if (isExtensionActive('html_mail')) {
// HTML extension is active
- 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(
- getMemberId(),
- postRequestElement('subject'),
- postRequestElement('text'),
- $receiver,
- bigintval(postRequestElement('mail_type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- bigintval($content['target_send']),
- bigintval(postRequestElement('zip'), TRUE, FALSE),
- postRequestElement('html')
- ), __FILE__, __LINE__);
- } else {
- // No HTML extension is active
- 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(
- getMemberId(),
- postRequestElement('subject'),
- postRequestElement('text'),
- $receiver,
- bigintval(postRequestElement('mail_type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- bigintval($content['target_send']),
- bigintval(postRequestElement('zip'), TRUE, FALSE),
- ), __FILE__, __LINE__);
- }
+ $data['html_msg'] = postRequestElement('html');
+ } // END - if
// Get insert id
- $id = SQL_INSERTID();
+ $data['id'] = insertDataIntoPool($data);
} else {
- // Change current order
+ // Update this data
+ $data = array(
+ 'subject' => postRequestElement('subject'),
+ 'text' => postRequestElement('text'),
+ 'receivers' => $receivers,
+ 'payment_id' => bigintval(postRequestElement('mail_type')),
+ 'timestamp' => 'UNIX_TIMESTAMP()',
+ 'url' => postRequestElement('url'),
+ 'cat_id' => bigintval(postRequestElement('cat')),
+ 'target_send' => bigintval($content['target_send']),
+ 'zip' => bigintval(postRequestElement('zip'), TRUE, FALSE),
+ );
+
+ // Is ext-html_mail active?
if (isExtensionActive('html_mail')) {
// HTML extension is active
- SQL_QUERY_ESC("UPDATE
- `{?_MYSQL_PREFIX?}_pool`
-SET
- `subject`='%s',
- `text`='%s',
- `receivers`='%s',
- `payment_id`=%s,
- `timestamp`=UNIX_TIMESTAMP(),
- `url`='%s',
- `cat_id`=%s,
- `target_send`=%s,
- `zip`=%s,
- `html_msg`='%s'
-WHERE
- `id`=%s
-LIMIT 1",
- array(
- postRequestElement('subject'),
- postRequestElement('text'),
- $receiver,
- bigintval(postRequestElement('mail_type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $content['target_send'],
- bigintval(postRequestElement('zip')),
- postRequestElement('html'),
- bigintval($id)
- ), __FILE__, __LINE__);
- } else {
- // No HTML extension is active
- SQL_QUERY_ESC("UPDATE
- `{?_MYSQL_PREFIX?}_pool`
-SET
- `subject`='%s',
- `text`='%s',
- `receivers`='%s',
- `payment_id`=%s,
- `timestamp`=UNIX_TIMESTAMP(),
- `url`='%s',
- `cat_id`=%s,
- `target_send`=%s,
- `zip`=%s
-WHERE
- `id`=%s
-LIMIT 1",
- array(
- postRequestElement('subject'),
- postRequestElement('text'),
- $receiver,
- bigintval(postRequestElement('mail_type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $content['target_send'],
- bigintval(postRequestElement('zip')),
- bigintval($id)
- ), __FILE__, __LINE__);
- }
+ $data['html_msg'] = postRequestElement('html');
+ } // END - if
+
+ // Update pool data
+ updatePoolDataById($data['id'], NULL, $data);
}
// Make sure only valid id numbers can pass
- assert((!is_bool($id)) && ($id > 0));
+ assert((isset($data['id'])) && (isValidId($data['id'])));
// 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;
+ $data['url'] = 'modules.php?module=frametester&order=' . bigintval($data['id']);
} elseif ($content['target_send'] == '0') {
// Not enougth receivers found which can receive mails
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2');
} else {
// No enougth points left!
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS');
}
} else {
// Ordered more mails than he can send in this category
- $url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
}
} // END - if
} 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')) {
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
+} elseif (($ALLOWED == '0') && (getOrderMaxFull() == 'ORDER')) {
// No more mail orders allowed
displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
-} elseif (getTotalUnconfirmedMails(getMemberId()) < getConfig('unconfirmed')) {
+} elseif (getTotalUnconfirmedMails(getMemberId()) < getConfig('max_unconfirmed')) {
// Show only enabled categories to the user ...
$whereStatement = " WHERE `visible`='Y'";
@@ -435,17 +276,17 @@ LIMIT 1",
if (isAdmin()) $whereStatement = '';
// Display order form
- $result_cats = SQL_QUERY("SELECT
+ $result_cats = sqlQuery('SELECT
`id`,
`cat`
FROM
`{?_MYSQL_PREFIX?}_cats`
-".$whereStatement."
+' . $whereStatement . '
ORDER BY
- `sort` ASC", __FILE__, __LINE__);
+ `sort` ASC', __FILE__, __LINE__);
// Some categories found?
- if (!SQL_HASZERONUMS($result_cats)) {
+ if (!ifSqlHasZeroNumRows($result_cats)) {
// Enought points left?
if ($totalPoints > 0) {
// Initialize array...
@@ -457,93 +298,68 @@ ORDER BY
// Enable HTML checking
// @TODO Rewrite this to a filter
- $HTML = ''; $HOL_STRING = '';
+ $HTML = '';
if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
$HTML = " AND `html`='Y'";
} // END - if
- if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
- // Extension's version is fine
- $HOL_STRING = " AND `holiday_active`='N'";
- } // END - if
// ... and begin loading stuff
- while ($categoriesContent = SQL_FETCHARRAY($result_cats)) {
+ while ($categoriesContent = sqlFetchArray($result_cats)) {
$categories['id'][] = bigintval($categoriesContent['id']);
array_push($categories['name'], $categoriesContent['cat']);
// 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",
+ $result_userids = sqlQueryEscaped('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != %s ORDER BY `userid` ASC',
array(bigintval($categoriesContent['id']), getMemberId()), __FILE__, __LINE__);
$userid_cnt = '0';
- while (list($userid) = SQL_FETCHROW($result_userids)) {
- // Check for holiday system
- $isHolidayActive = FALSE;
- if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
- // Check user's holiday status
- $result_holiday = SQL_QUERY_ESC("SELECT
- COUNT(d.`userid`) AS `cnt`
-FROM
- `{?_MYSQL_PREFIX?}_user_data` AS d
-LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_holidays` AS h
-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()
-LIMIT 1",
- array(bigintval($userid)), __FILE__, __LINE__);
+ while (list($userid) = sqlFetchRow($result_userids)) {
+ // Init filter data array
+ $filterData = array(
+ 'userid' => $userid,
+ 'pre_okay' => TRUE,
+ );
- // Fetch entry
- list($count) = SQL_FETCHROW($result_holiday);
-
- // Free memory
- SQL_FREERESULT($result_holiday);
-
- // Is holiday is active?
- $isHolidayActive = ($count == 1);
- } // END - if
+ // Check for holiday system
+ $filterData = runFilterChain('pre_category_mail_order_check', $filterData);
- if ($isHolidayActive === FALSE) {
+ // Still all fine?
+ if ($filterData['pre_okay'] === TRUE) {
// 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",
+ $result_ver = sqlQueryEscaped("SELECT `zip` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s" . $HTML . " AND `receive_mails` > 0 AND `status`='CONFIRMED' LIMIT 1",
array(bigintval($userid)), __FILE__, __LINE__);
- if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
+ // Is an entry found?
+ if ((sqlNumRows($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
// Get zip code
- list($zip) = SQL_FETCHROW($result_ver);
+ list($zip) = sqlFetchRow($result_ver);
if (substr($zip, 0, strlen(postRequestElement('zip'))) == postRequestElement('zip')) {
// Ok, ZIP code part is found
$userid_cnt++;
} // END - if
} else {
// Count numbers up!
- $userid_cnt += SQL_NUMROWS($result_ver);
+ $userid_cnt += sqlNumRows($result_ver);
}
// Free result
- SQL_FREERESULT($result_ver);
+ sqlFreeResult($result_ver);
} // END - if
} // END - while
// Free memory
- SQL_FREERESULT($result_userids);
+ sqlFreeResult($result_userids);
array_push($categories['userids'], $userid_cnt);
} // END - while
// Free memory
- SQL_FREERESULT($result_cats);
+ sqlFreeResult($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 = sqlQuery("SELECT `id`, `price`, `payment`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `price` > 0 AND `payment` > 0 ORDER BY `payment` ASC", __FILE__, __LINE__);
- $types = array();
- if (!SQL_HASZERONUMS($result)) {
+ $payments = array();
+ if (!ifSqlHasZeroNumRows($result)) {
// Is the error code set?
if (isGetRequestElementSet('code')) {
// Display error message
@@ -551,18 +367,18 @@ LIMIT 1",
} // END - if
// Load all email types...
- while ($type = SQL_FETCHARRAY($result)) {
- array_push($types, $type);
+ while ($payment = sqlFetchArray($result)) {
+ array_push($payments, $payment);
} // END - while
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Output user's points
$content['total_points'] = $totalPoints;
// Check how many mail orders he has placed today and how many he's allowed to send
- switch (getConfig('order_max_full')) {
+ switch (getOrderMaxFull()) {
case 'MAX': // He is allowed to send as much as possible
$content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_MAX--}';
break;
@@ -572,7 +388,7 @@ LIMIT 1",
break;
default: // Unknown/invalid
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getOrderMaxFull()));
$content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_UNKNOWN--}';
break;
} // END - switch
@@ -587,7 +403,7 @@ LIMIT 1",
$target = '';
// Check if we already have an order placed and make it editable
- $result = SQL_QUERY_ESC("SELECT
+ $result = sqlQueryEscaped("SELECT
`subject`,
`text`,
`payment_id`,
@@ -604,9 +420,9 @@ WHERE
LIMIT 1",
array(getMemberId()), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Old order found
- $content = merge_array($content, SQL_FETCHARRAY($result));
+ $content = merge_array($content, sqlFetchArray($result));
// Fix max receivers when it is too much
if ((isset($categories['userids'][$content['cat_id']])) && ($content['target_send'] > $categories['userids'][$content['cat_id']])) {
@@ -625,20 +441,20 @@ LIMIT 1",
}
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
if ((isPostRequestElementSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
// Pre-output categories
$content['category_selection'] = generateCategoryOptionsList(((isExtensionActive('html_mail')) && (isPostRequestElementSet('html'))) ? postRequestElement('html') : 'N', getMemberId());
// Mail type
- $content['type_selection'] = '';
- foreach ($types as $key => $value) {
+ $content['payment_selection'] = '';
+ foreach ($payments as $key => $value) {
if (is_array($value)) {
// Output option line
- $content['type_selection'] .= '