X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=e87be3b9acee37dcb492bc36f33a20fbd8b0876e;hb=8202991f32bfb2056e94a11746c0b5308fe4a273;hp=de7899c8f22587618be64879395ce65ce731a4d5;hpb=61234f4bdf7b153688f02a4af85c5cc54a7b010c;p=mailer.git
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index de7899c8f2..e87be3b9ac 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -50,9 +50,6 @@ if ((!isExtensionActive('order')) && (!isAdmin())) {
$url = ''; $id = '0';
-// Count unconfirmed mails
-$links = getTotalUnconfirmedMails(getMemberId());
-
$ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
@@ -62,11 +59,11 @@ $total = getTotalPoints(getMemberId());
if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
// Holiday is active!
displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
-} elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
+} 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 `id`, `data_type`
+ $result = SQL_QUERY_ESC("SELECT `id`,`data_type`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
@@ -76,7 +73,7 @@ WHERE
LIMIT 1",
array(
getMemberId(),
- postRequestParameter('url')
+ postRequestElement('url')
), __FILE__, __LINE__);
$type = 'TEMP'; $id = '0';
@@ -95,13 +92,13 @@ LIMIT 1",
$url = '';
if (getConfig('allow_url_in_text') == 'Y') {
// Test submitted text against some filters (length, URLs in text etc.)
- if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
+ 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("\n", '', str_replace("\r", '', postRequestParameter('text')));
+ $TEST = str_replace("\n", '', str_replace("\r", '', postRequestElement('text')));
// Text length within allowed length?
if (strlen($TEST) > getConfig('max_tlength')) {
@@ -113,8 +110,8 @@ LIMIT 1",
// Shall I test the subject line against URLs?
if (getConfig('allow_url_in_subject') == 'Y') {
// Check the subject line for issues
- setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
- if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
+ setPostRequestElement('subject', str_replace("\\", '[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
@@ -124,7 +121,7 @@ LIMIT 1",
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__);
+ array(postRequestElement('url')), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Jupp, we got one listed
@@ -139,13 +136,13 @@ LIMIT 1",
} // END - if
// Enougth receivers entered?
- if ((postRequestParameter('receiver') < getConfig('order_min')) && (!isAdmin())) {
+ 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(postRequestParameter('url'))) {
+ if (!isUrlValid(postRequestElement('url'))) {
// URL is invalid!
$url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
} // END - if
@@ -153,20 +150,20 @@ LIMIT 1",
// Probe for HTML extension
if (isExtensionActive('html_mail')) {
// HTML or regular text mail?
- if (postRequestParameter('html') == 'Y') {
+ if (postRequestElement('html') == 'Y') {
// Chek for valid HTML tags
- setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text')));
+ setPostRequestElement('text', checkHtmlTags(postRequestElement('text')));
// Maybe invalid tags found?
- if (!isPostRequestParameterSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
+ if (!isPostRequestElementSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
} else {
// Remove any HTML code
- setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
+ setPostRequestElement('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestElement('text'))));
}
} // END - if
// Is mail type set?
- if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('mail_type') < 1)) {
+ if ((!isPostRequestElementSet('mail_type')) || (postRequestElement('mail_type') < 1)) {
// Not correctly set
$url = 'modules.php?module=login&what=order&code=' . getCode('NO_MAIL_TYPE');
} // END - if
@@ -179,10 +176,10 @@ LIMIT 1",
if (empty($url)) {
// Check if category and number of receivers is okay
$add = '';
- if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
+ if ((isOrderMultiPageEnabled()) && (isPostRequestElementSet('zip')) && (postRequestElement('zip') != '')) {
// Choose recipients by ZIP code
$add = sprintf(" AND d.zip LIKE '%s%%'",
- bigintval(postRequestParameter('zip'))
+ bigintval(postRequestElement('zip'))
);
} // END - if
@@ -204,12 +201,12 @@ WHERE
ORDER BY
d.{?order_select?} {?order_mode?}",
array(
- bigintval(postRequestParameter('cat')),
+ bigintval(postRequestElement('cat')),
getMemberId()
), __FILE__, __LINE__);
// Do we enougth receivers left?
- if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
+ if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
// Load receivers from database
$TEST = array(); $count = '0';
while ($holidayContent = SQL_FETCHARRAY($result)) {
@@ -258,16 +255,16 @@ LIMIT 1",
), __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'));
+ if ($content['target_send'] > postRequestElement('receiver')) {
+ $content['target_send'] = bigintval(postRequestElement('receiver'));
} // END - if
// Calculate used points
- $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
+ $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestElement('mail_type')));
// Fix empty zip code
- if (!isPostRequestParameterSet('zip')) {
- setPostRequestParameter('zip', 0);
+ if (!isPostRequestElementSet('zip')) {
+ setPostRequestElement('zip', 0);
} // END - if
// Check if he has enougth points for this order and selected more than 0 receivers
@@ -309,15 +306,15 @@ LIMIT 1",
)",
array(
getMemberId(),
- postRequestParameter('subject'),
- postRequestParameter('text'),
+ postRequestElement('subject'),
+ postRequestElement('text'),
$receiver,
- bigintval(postRequestParameter('mail_type')),
- postRequestParameter('url'),
- bigintval(postRequestParameter('cat')),
+ bigintval(postRequestElement('mail_type')),
+ postRequestElement('url'),
+ bigintval(postRequestElement('cat')),
bigintval($content['target_send']),
- bigintval(postRequestParameter('zip'), true, false),
- postRequestParameter('html')
+ bigintval(postRequestElement('zip'), true, false),
+ postRequestElement('html')
), __FILE__, __LINE__);
} else {
// No HTML extension is active
@@ -350,14 +347,14 @@ LIMIT 1",
)",
array(
getMemberId(),
- postRequestParameter('subject'),
- postRequestParameter('text'),
+ postRequestElement('subject'),
+ postRequestElement('text'),
$receiver,
- bigintval(postRequestParameter('mail_type')),
- postRequestParameter('url'),
- bigintval(postRequestParameter('cat')),
+ bigintval(postRequestElement('mail_type')),
+ postRequestElement('url'),
+ bigintval(postRequestElement('cat')),
bigintval($content['target_send']),
- bigintval(postRequestParameter('zip'), true, false),
+ bigintval(postRequestElement('zip'), true, false),
), __FILE__, __LINE__);
}
} else {
@@ -381,15 +378,15 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestParameter('subject'),
- postRequestParameter('text'),
+ postRequestElement('subject'),
+ postRequestElement('text'),
$receiver,
- bigintval(postRequestParameter('mail_type')),
- postRequestParameter('url'),
- bigintval(postRequestParameter('cat')),
+ bigintval(postRequestElement('mail_type')),
+ postRequestElement('url'),
+ bigintval(postRequestElement('cat')),
$content['target_send'],
- bigintval(postRequestParameter('zip')),
- postRequestParameter('html'),
+ bigintval(postRequestElement('zip')),
+ postRequestElement('html'),
bigintval($id)
), __FILE__, __LINE__);
} else {
@@ -410,14 +407,14 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestParameter('subject'),
- postRequestParameter('text'),
+ postRequestElement('subject'),
+ postRequestElement('text'),
$receiver,
- bigintval(postRequestParameter('mail_type')),
- postRequestParameter('url'),
- bigintval(postRequestParameter('cat')),
+ bigintval(postRequestElement('mail_type')),
+ postRequestElement('url'),
+ bigintval(postRequestElement('cat')),
$content['target_send'],
- bigintval(postRequestParameter('zip')),
+ bigintval(postRequestElement('zip')),
bigintval($id)
), __FILE__, __LINE__);
}
@@ -429,8 +426,8 @@ LIMIT 1",
$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(
getMemberId(),
- postRequestParameter('subject'),
- bigintval(postRequestParameter('mail_type'))
+ postRequestElement('subject'),
+ bigintval(postRequestElement('mail_type'))
), __FILE__, __LINE__);
// Get pool id
@@ -454,13 +451,13 @@ LIMIT 1",
$url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
}
} // END - if
-} elseif (postRequestParameter('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')) {
// No more mail orders allowed
displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
-} elseif ($links < getConfig('unconfirmed')) {
+} elseif (getTotalUnconfirmedMails(getMemberId()) < getConfig('unconfirmed')) {
// Show only enabled categories to the user ...
$whereStatement = " WHERE `visible`='Y'";
@@ -469,7 +466,7 @@ LIMIT 1",
// Display order form
$result_cats = SQL_QUERY("SELECT
- `id`, `cat`
+ `id`,`cat`
FROM
`{?_MYSQL_PREFIX?}_cats`
".$whereStatement."
@@ -487,7 +484,7 @@ ORDER BY
// Enable HTML checking
// @TODO Rewrite this to a filter
$HTML = ''; $HOL_STRING = '';
- if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+ if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
$HTML = " AND `html`='Y'";
} // END - if
if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
@@ -543,10 +540,10 @@ LIMIT 1",
$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($userid)), __FILE__, __LINE__);
- if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) {
+ if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
// Get zip code
list($zip) = SQL_FETCHROW($result_ver);
- if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
+ if (substr($zip, 0, strlen(postRequestElement('zip'))) == postRequestElement('zip')) {
// Ok, ZIP code part is found
$userid_cnt++;
} // END - if
@@ -569,12 +566,12 @@ LIMIT 1",
SQL_FREERESULT($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 = SQL_QUERY("SELECT `id`,`price`,`payment`,`mail_title` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
$types = array();
if (!SQL_HASZERONUMS($result)) {
// Check for message id in URL
- $message = getMessageFromErrorCode(getRequestParameter('code'));
+ $message = getMessageFromErrorCode(getRequestElement('code'));
if (!empty($message)) {
// We got system message so we drop it out to the user
@@ -619,7 +616,7 @@ LIMIT 1",
// Check if we already have an order placed and make it editable
$result = SQL_QUERY_ESC("SELECT
- `subject`, `text`, `payment_id`, `timestamp`, `url`, `target_send`, `cat_id`, `zip`
+ `subject`,`text`,`payment_id`,`timestamp`,`url`,`target_send`,`cat_id`,`zip`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
@@ -651,13 +648,13 @@ LIMIT 1",
// Free result
SQL_FREERESULT($result);
- if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+ if ((isPostRequestElementSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
// Pre-output categories
$content['category_selection'] = '';
foreach ($categories['id'] as $key => $value) {
$content['category_selection'] .= ' ';
} // END - foreach
// Mail type
@@ -674,13 +671,13 @@ LIMIT 1",
// No content is default
$content['zip_content'] = '';
- if (isPostRequestParameterSet('zip')) {
+ if (isPostRequestElementSet('zip')) {
// Output entered ZIP code
- $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
+ $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestElement('zip'));
} // END - if
// HTML extension
- if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+ if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
// Extension is active so output valid HTML tags
$content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags());
} else {
@@ -706,9 +703,9 @@ LIMIT 1",
// Do we want ZIP code or not?
if ((isOrderMultiPageEnabled()) || (isAdmin())) {
// Yes
- if (postRequestParameter('zip') > 0) {
+ if (postRequestElement('zip') > 0) {
$data = array(
- 'zip' => bigintval(postRequestParameter('zip'))
+ 'zip' => bigintval(postRequestElement('zip'))
);
} else {
$data = array(
@@ -723,19 +720,19 @@ LIMIT 1",
}
} else {
// No mail types defined
- displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}');
+ displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}');
}
} else {
// No points left
- displayMessage('{--MEMBER_ORDER_NO_POINTS--}');
+ displayMessage('{--MEMBER_ORDER_NO_POINTS--}');
}
} else {
// No cateogries are defined yet
- displayMessage('{--MEMBER_NO_CATEGORIES--}');
+ displayMessage('{--MEMBER_NO_CATEGORIES--}');
}
} else {
// Please confirm some mails first
- displayMessage('{%message,MEMBER_ORDER_LINKS_LEFT=' . $links . '%}', $links);
+ displayMessage('{%message,MEMBER_ORDER_LINKS_LEFT=' . getTotalUnconfirmedMails(getMemberId()) . '%}');
}
if (!empty($url)) {