X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=4189b7d78f6211872c1e04588d1f89a2469c1959;hb=be79afde3071dfc4d6fe845ddb75abf13534eadb;hp=1b1dd1984c29df084f31ad63e4dd97a93faa967c;hpb=34db702d004b245e5528b0ba20c6de441f61820a;p=mailer.git
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 1b1dd1984c..4189b7d78f 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -43,17 +41,17 @@ 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'));
+ displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
return;
} // END - if
$url = ''; $id = '0';
// Count unconfirmed mails
-$links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
+$links = getTotalUnconfirmedMails(getMemberId());
$ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
@@ -61,20 +59,20 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails'
// Now check his points amount
$total = getTotalPoints(getMemberId());
-if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
// Holiday is active!
- loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
+ displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
} 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...
- $result = SQL_QUERY_ESC("SELECT `id`, `data_type`
+ $result = SQL_QUERY_ESC("SELECT `id`,`data_type`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
`sender`=%s AND
`url`='%s' AND
- `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})
+ (UNIX_TIMESTAMP() - `timestamp`) >= {?url_tlock?}
LIMIT 1",
array(
getMemberId(),
@@ -84,6 +82,7 @@ LIMIT 1",
$type = 'TEMP'; $id = '0';
if (SQL_NUMROWS($result) == 1) {
// Load id and mail type
+ // @TODO Rewrite this to SQL_FETCHARRAY()
list($id, $type) = SQL_FETCHROW($result);
} // END - if
@@ -97,7 +96,7 @@ LIMIT 1",
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)) {
- // URL found!
+ // URL found
$url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND');
} // END - if
@@ -122,7 +121,7 @@ LIMIT 1",
} // END - if
// And shall I check that his URL is not in the black list?
- if (getConfig('url_blacklist') == 'Y') {
+ 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__);
@@ -173,14 +172,14 @@ LIMIT 1",
} // END - if
} elseif (!isAdmin()) {
// He has already sent a mail within a specific time
- $url = 'modules.php?module=login&what=order&code=' . getCode('URL_TLOCK') . '&id=' . $id;
+ $url = 'modules.php?module=login&what=order&code=' . getCode('URL_TIME_LOCK') . '&id=' . $id;
}
// Still no error?
if (empty($url)) {
// Check if category and number of receivers is okay
$add = '';
- if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
+ if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
// Choose recipients by ZIP code
$add = sprintf(" AND d.zip LIKE '%s%%'",
bigintval(postRequestParameter('zip'))
@@ -203,18 +202,16 @@ WHERE
d.receive_mails > 0
".$add."
ORDER BY
- d.%s %s",
+ d.{?order_select?} {?order_mode?}",
array(
bigintval(postRequestParameter('cat')),
- getMemberId(),
- getConfig('order_select'),
- getConfig('order_mode'),
+ getMemberId()
), __FILE__, __LINE__);
// 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
@@ -223,10 +220,15 @@ ORDER BY
FROM
`{?_MYSQL_PREFIX?}_user_holidays`
WHERE
- `userid`=%s AND `holiday_start` < UNIX_TIMESTAMP() AND `holiday_end` > UNIX_TIMESTAMP()
+ `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) $holidayContent['userid'] = '0'; // Exclude user who are in holiday
+ if (SQL_NUMROWS($result_holiday) == 1) {
+ // Exclude user who are in holiday
+ $holidayContent['userid'] = '0';
+ } // END - if
// Free memory
SQL_FREERESULT($result_holiday);
@@ -235,7 +237,7 @@ LIMIT 1",
if ($holidayContent['userid'] > 0) {
// Add receiver
$TEST[] = $holidayContent['userid'];
- $cnt++;
+ $count++;
} // END - if
} // END - while
@@ -250,16 +252,23 @@ LIMIT 1",
// Update receiver list
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
- array(convertReceivers($receiver), $content['target_send']), __FILE__, __LINE__);
+ array(
+ convertReceivers($receiver),
+ bigintval($content['target_send'])
+ ), __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'] > postRequestParameter('receiver')) {
+ $content['target_send'] = bigintval(postRequestParameter('receiver'));
+ } // END - if
// Calculate used points
$USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
// Fix empty zip code
- if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
+ if (!isPostRequestParameterSet('zip')) {
+ setPostRequestParameter('zip', 0);
+ } // END - if
// Check if he has enougth points for this order and selected more than 0 receivers
if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
@@ -269,8 +278,35 @@ LIMIT 1",
$id = '0';
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')",
+ 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(),
postRequestParameter('subject'),
@@ -279,14 +315,39 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
- $content['target_send'],
+ bigintval($content['target_send']),
bigintval(postRequestParameter('zip'), true, false),
postRequestParameter('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)",
+ 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(),
postRequestParameter('subject'),
@@ -295,7 +356,7 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
- $content['target_send'],
+ bigintval($content['target_send']),
bigintval(postRequestParameter('zip'), true, false),
), __FILE__, __LINE__);
}
@@ -388,17 +449,17 @@ 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');
} elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
// No more mail orders allowed
- loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
+ displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
} elseif ($links < getConfig('unconfirmed')) {
// Show only enabled categories to the user ...
$whereStatement = " WHERE `visible`='Y'";
@@ -408,7 +469,7 @@ LIMIT 1",
// Display order form
$result_cats = SQL_QUERY("SELECT
- `id`, `cat`
+ `id`,`cat`
FROM
`{?_MYSQL_PREFIX?}_cats`
".$whereStatement."
@@ -426,7 +487,9 @@ ORDER BY
// Enable HTML checking
// @TODO Rewrite this to a filter
$HTML = ''; $HOL_STRING = '';
- if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
+ if ((isExtensionActive('html_mail')) && (postRequestParameter('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'";
@@ -442,7 +505,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')) {
@@ -463,28 +526,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')) {
+ if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) {
// 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 {
@@ -506,7 +569,7 @@ 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)) {
@@ -515,7 +578,7 @@ LIMIT 1",
if (!empty($message)) {
// We got system message so we drop it out to the user
- loadTemplate('admin_settings_saved', false, $message);
+ displayMessage($message);
} // END - if
// Load all email types...
@@ -527,7 +590,7 @@ LIMIT 1",
SQL_FREERESULT($result);
// Output user's points
- $content['total'] = translateComma($total);
+ $content['total_points'] = $total;
// Check how many mail orders he has placed today and how many he's allowed to send
switch (getConfig('order_max_full')) {
@@ -556,7 +619,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
@@ -580,7 +643,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--}';
}
@@ -588,7 +651,7 @@ LIMIT 1",
// Free result
SQL_FREERESULT($result);
- if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+ if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
// Pre-output categories
$content['category_selection'] = '';
foreach ($categories['id'] as $key => $value) {
@@ -600,12 +663,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'] .= ' ';
} // END - if
} // END - foreach
@@ -642,7 +704,7 @@ LIMIT 1",
$content['zip_content'] = '';
// Do we want ZIP code or not?
- if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) {
+ if ((isOrderMultiPageEnabled()) || (isAdmin())) {
// Yes
if (postRequestParameter('zip') > 0) {
$data = array(
@@ -661,19 +723,19 @@ LIMIT 1",
}
} else {
// No mail types defined
- loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}');
+ displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}');
}
} else {
// No points left
- loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}');
+ displayMessage('{--MEMBER_ORDER_NO_POINTS--}');
}
} else {
// No cateogries are defined yet
- loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}');
+ displayMessage('{--MEMBER_NO_CATEGORIES--}');
}
} else {
// Please confirm some mails first
- loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
+ displayMessage('{%message,MEMBER_ORDER_LINKS_LEFT=' . $links . '%}', $links);
}
if (!empty($url)) {