X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=a950b0993d6cc2efe11e1f082a8f6dab1d99960d;hp=e4cd4069471ff876dfd18625091b44a96c4b98b4;hb=3bc521fc37d34c66b3483cdeef37038408f95b63;hpb=a1ab2fa4296e58f66a15ac7b568a1454713a61ee
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index e4cd406947..a950b0993d 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -62,14 +63,14 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
// Do we have ext-holiday installed?
// @TODO Rewrite this to a filter
-$HOLIDAY = 'userid';
+$extraColumn = 'userid';
if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
// Fetch also holiday activation data
- $HOLIDAY = 'holiday_active';
+ $extraColumn = 'holiday_active';
} // END - if
$result_mmails = SQL_QUERY_ESC("SELECT
- `userid`, `receive_mails`, `mail_orders`, `".$HOLIDAY."`
+ `userid`, `receive_mails`, `mail_orders`, `".$extraColumn."`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
@@ -96,7 +97,7 @@ $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTot
if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
// Holiday is active!
loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE'));
-} elseif ((isPostRequestElementSet('frametester')) && ($ALLOWED > 0) && (postRequestElement('receiver') > 0)) {
+} elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('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...
@@ -110,7 +111,7 @@ WHERE
LIMIT 1",
array(
getMemberId(),
- postRequestElement('url'),
+ postRequestParameter('url'),
getConfig('url_tlock')
), __FILE__, __LINE__);
@@ -129,13 +130,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(postRequestElement('text')), 'https://') > -1) || (strpos(strtolower(postRequestElement('text')), 'http://') > -1) || (strpos(strtolower(postRequestElement('text')), "www") > -1)) {
+ if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
// 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", '', postRequestElement('text')));
+ $TEST = str_replace("\n", '', str_replace("\r", '', postRequestParameter('text')));
// Text length within allowed length?
if (strlen($TEST) > getConfig('max_tlength')) {
@@ -147,8 +148,8 @@ LIMIT 1",
// Shall I test the subject line against URLs?
if (getConfig('allow_url_in_subject') == 'Y') {
// Check the subject line for issues
- setRequestPostElement('subject', str_replace("\\", '[nl]', substr(postRequestElement('subject'), 0, 200)));
- if ((strpos(strtolower(postRequestElement('subject')), 'http://') > -1) || (strpos(strtolower(postRequestElement('subject')), "www") > -1)) {
+ setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
+ if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
// URL in subject found
$URL = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL');
} // END - if
@@ -158,7 +159,7 @@ LIMIT 1",
if (getConfig('url_blacklist') == 'Y') {
// 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(postRequestElement('url')), __FILE__, __LINE__);
+ array(postRequestParameter('url')), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Jupp, we got one listed
@@ -173,13 +174,13 @@ LIMIT 1",
} // END - if
// Enougth receivers entered?
- if ((postRequestElement('receiver') < getConfig('order_min')) && (!isAdmin())) {
+ if ((postRequestParameter('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'))) {
+ if (!isUrlValid(postRequestParameter('url'))) {
// URL is invalid!
$URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
} // END - if
@@ -187,15 +188,15 @@ LIMIT 1",
// Probe for HTML extension
if (isExtensionActive('html_mail')) {
// HTML or regular text mail?
- if (postRequestElement('html') == 'Y') {
+ if (postRequestParameter('html') == 'Y') {
// Chek for valid HTML tags
- setRequestPostElement('text', checkHtmlTags(postRequestElement('text')));
+ setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text')));
// Maybe invalid tags found?
- if (!isPostRequestElementSet('text')) $URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
+ if (!isPostRequestParameterSet('text')) $URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
} else {
// Remove any HTML code
- setRequestPostElement('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestElement('text'))));
+ setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
}
}
} elseif (!isAdmin()) {
@@ -207,9 +208,9 @@ LIMIT 1",
if (empty($URL)) {
// Check if category and number of receivers is okay
$add = '';
- if ((getConfig('order_multi_page') == 'Y') && (isPostRequestElementSet('zip'))) {
+ if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
// Choose recipients by ZIP code
- $add = " AND d.zip LIKE '".bigintval(postRequestElement('zip'))."{PER}'";
+ $add = " AND d.zip LIKE '".bigintval(postRequestParameter('zip'))."{PER}'";
} // END - if
// Check for userids
@@ -226,25 +227,18 @@ WHERE
ORDER BY
d.%s %s",
array(
- bigintval(postRequestElement('cat')),
+ bigintval(postRequestParameter('cat')),
getMemberId(),
getConfig('order_select'),
getConfig('order_mode'),
), __FILE__, __LINE__);
// Do we enougth receivers left?
- if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
- // Check for holiday extensions
- $HOLIDAY = false;
- if (getExtensionVersion('holiday') >= '0.1.3') {
- // Include checking for users in holiday
- $HOLIDAY = true;
- } // END - if
-
+ if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
// Load receivers from database
$TEST = array(); $cnt = '0';
while ($holidayContent = SQL_FETCHARRAY($result)) {
- if ($HOLIDAY) {
+ if (getExtensionVersion('holiday') >= '0.1.3') {
// Check for his holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
`id`
@@ -281,13 +275,13 @@ LIMIT 1",
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'));
+ if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
// Calculate used points
- $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestElement('type')));
+ $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('type')));
// Fix empty zip code
- if (!isPostRequestElementSet('zip')) setRequestPostElement('zip', 0);
+ if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
// Check if he has enougth points for this order and selected more than 0 receivers
if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
@@ -301,15 +295,15 @@ LIMIT 1",
VALUES ('%s','%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
array(
getMemberId(),
- postRequestElement('subject'),
- postRequestElement('text'),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
$receiver,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
+ bigintval(postRequestParameter('type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestElement('zip')),
- postRequestElement('html')
+ bigintval(postRequestParameter('zip')),
+ postRequestParameter('html')
), __FILE__, __LINE__);
} else {
// No HTML extension is active
@@ -317,14 +311,14 @@ LIMIT 1",
VALUES ('%s','%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
array(
getMemberId(),
- postRequestElement('subject'),
- postRequestElement('text'),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
$receiver,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
+ bigintval(postRequestParameter('type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestElement('zip')),
+ bigintval(postRequestParameter('zip')),
), __FILE__, __LINE__);
}
} else {
@@ -348,15 +342,15 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestElement('subject'),
- postRequestElement('text'),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
$receiver,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
+ bigintval(postRequestParameter('type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestElement('zip')),
- postRequestElement('html'),
+ bigintval(postRequestParameter('zip')),
+ postRequestParameter('html'),
bigintval($id)
), __FILE__, __LINE__);
} else {
@@ -377,14 +371,14 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestElement('subject'),
- postRequestElement('text'),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
$receiver,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
+ bigintval(postRequestParameter('type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestElement('zip')),
+ bigintval(postRequestParameter('zip')),
bigintval($id)
), __FILE__, __LINE__);
}
@@ -396,8 +390,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(),
- postRequestElement('subject'),
- bigintval(postRequestElement('type'))
+ postRequestParameter('subject'),
+ bigintval(postRequestParameter('type'))
), __FILE__, __LINE__);
// Get pool id
@@ -421,7 +415,7 @@ LIMIT 1",
$URL = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
}
}
-} elseif (postRequestElement('receiver') == '0') {
+} elseif (postRequestParameter('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')) {
@@ -447,11 +441,11 @@ ORDER BY
// Enable HTML checking
// @TODO Rewrite this to a filter
- $HTML = ''; $HOLIDAY = false; $HOL_STRING = '';
- if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) $HTML = " AND `html`='Y'";
+ $HTML = ''; $HOL_STRING = '';
+ if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
if (getExtensionVersion('holiday') >= '0.1.3') {
// Extension's version is fine
- $HOLIDAY = true; $HOL_STRING = " AND `holiday_active`='N'";
+ $HOL_STRING = " AND `holiday_active`='N'";
} // END - if
// ... and begin loading stuff
@@ -467,7 +461,7 @@ ORDER BY
while (list($ucat) = SQL_FETCHROW($result_userids)) {
// Check for holiday system
$HOL_ACTIVE = false;
- if ($HOLIDAY) {
+ if (getExtensionVersion('holiday') >= '0.1.3') {
// Check user's holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
@@ -497,10 +491,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($ucat)), __FILE__, __LINE__);
- if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
+ 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(postRequestElement('zip'))) == postRequestElement('zip')) {
+ if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
// Ok, ZIP part is found
$userid_cnt++;
} // END - if
@@ -528,7 +522,7 @@ LIMIT 1",
$types = array();
if (SQL_NUMROWS($result) > 0) {
// Check for message id in URL
- $message = getMessageFromErrorCode(getRequestElement('code'));
+ $message = getMessageFromErrorCode(getRequestParameter('code'));
if (!empty($message)) {
// We got system message so we drop it out to the user
@@ -605,7 +599,7 @@ LIMIT 1",
// Free result
SQL_FREERESULT($result);
- if ((isPostRequestElementSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+ if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
// Pre-output categories
$content['category_selection'] = '';
foreach ($categories['id'] as $key => $value) {
@@ -626,34 +620,33 @@ LIMIT 1",
} // END - if
} // END - foreach
- if (isPostRequestElementSet('zip')) {
+ // No content is default
+ $content['zip_content'] = '';
+
+ if (isPostRequestParameterSet('zip')) {
// Output entered ZIP code
- $content['zip_content'] = loadTemplate('member_order-zip', true, postRequestElement('zip'));
- } else {
- $content['zip_content'] = "
";
- }
+ $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
+ } // END - if
// HTML extension
- if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) {
+ if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
// Extension is active so output valid HTML tags
$content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags());
} else {
// Extension not active and/or class not uploaded
- $content['html_extension'] = "
";
+ $content['html_extension'] = '
';
}
// Output form for page 2
loadTemplate('member_order_page2', false, $content);
} else {
// Remember maybe entered ZIP code in constant
- $add = '';
if (isExtensionActive('html_mail')) {
// Add some content when html extension is active
- if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = "
\n";
$content['html_extension'] = loadTemplate('member_order-html_intro', true);
} else {
// No HTML extension installed
- $content['html_extension'] = "
";
+ $content['html_extension'] = '
';
}
// Default is no ZIP code
@@ -662,15 +655,13 @@ LIMIT 1",
// Do we want ZIP code or not?
if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) {
// Yes
- if (postRequestElement('zip') > 0) {
+ if (postRequestParameter('zip') > 0) {
$data = array(
- 'zip' => bigintval(postRequestElement('zip')),
- 'add' => $add
+ 'zip' => bigintval(postRequestParameter('zip'))
);
} else {
$data = array(
- 'zip' => '',
- 'add' => $add
+ 'zip' => ''
);
}
$content['zip_content'] = loadTemplate('member_order-zip1', true, $data);
@@ -681,15 +672,15 @@ LIMIT 1",
}
} else {
// No mail types defined
- loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_PAYMENTS--}");
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}');
}
} else {
// No points left
- loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_POINTS--}");
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}');
}
} else {
// No cateogries are defined yet
- loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_CATS--}");
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}');
}
} elseif ($mmails == '0') {
// Please set more than 0 mails per day