X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=bd934037f5ddeea3956795a0dc659b55e23e84a1;hb=c66b1a42fe693a0cb3cf534b69b42fe73f881477;hp=1059d778a1fffc0fc946ad6cf5a98411a07a442f;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 1059d778a1..bd934037f5 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, 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 *
@@ -41,10 +41,10 @@ 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(generateExtensionInactiveNotInstalledMessage('order'));
return;
} // END - if
@@ -61,7 +61,7 @@ $total = getTotalPoints(getMemberId());
if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
// 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
//
@@ -72,7 +72,7 @@ FROM
WHERE
`sender`=%s AND
`url`='%s' AND
- `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})
+ (UNIX_TIMESTAMP() - `timestamp`) >= {?url_tlock?}
LIMIT 1",
array(
getMemberId(),
@@ -82,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
@@ -95,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
@@ -120,7 +121,7 @@ LIMIT 1",
} // END - if
// And shall I check that his URL is not in the black list?
- if (isUrlBlaskEnabled()) {
+ 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__);
@@ -210,7 +211,7 @@ ORDER BY
// 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
@@ -231,7 +232,7 @@ LIMIT 1",
if ($holidayContent['userid'] > 0) {
// Add receiver
$TEST[] = $holidayContent['userid'];
- $cnt++;
+ $count++;
} // END - if
} // END - while
@@ -387,17 +388,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'";
@@ -441,7 +442,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')) {
@@ -462,28 +463,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')) {
// 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 {
@@ -514,7 +515,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...
@@ -526,7 +527,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')) {
@@ -579,7 +580,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--}';
}
@@ -599,12 +600,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
@@ -660,19 +660,19 @@ LIMIT 1",
}
} else {
// No mail types defined
- loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}');
+ displayMessage('{--MEMBER_NO_PAYMENTS--}');
}
} else {
// No points left
- loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}');
+ displayMessage('{--MEMBER_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_LINKS_LEFT=' . $links . '%}', $links);
}
if (!empty($url)) {