X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=b7612de10b06383972a00cfff144764ba0ce4b5a;hb=3c9762973a6349e04c677ab53bc15de1bded135a;hp=47b7729e04f8b38248b667e2bf57ba6137b85abb;hpb=debaac55fafff501de5077f3672623c0d738a5b2;p=mailer.git
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 47b7729e04..b7612de10b 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -10,10 +10,10 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Hier koennen Ihre Mitglieder Mails buchen *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009) $ *
+ * $Revision:: $ *
+ * $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
- * $Author:: stelzi $ *
+ * $Author:: $ *
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
@@ -87,7 +87,7 @@ $ALLOWED = $MAXI - $ORDERS;
if (getConfig('order_max_full') == "MAX") $ALLOWED = $MAXI;
// Now check his points amount
-$TOTAL = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");;
+$total = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");;
if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3")) {
// Holiday is active!
@@ -193,17 +193,17 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
// Still no error?
if (empty($URL)) {
// Check if category and number of receivers is okay
- $ADD = "";
+ $add = "";
if ((getConfig('order_multi_page') == "Y") && (REQUEST_ISSET_POST(('zip')))) {
// Choose recipients by ZIP code
- $ADD = " AND d.zip LIKE '".bigintval(REQUEST_POST('zip'))."{PER}'";
+ $add = " AND d.zip LIKE '".bigintval(REQUEST_POST('zip'))."{PER}'";
} // END - if
// Check for userids
$result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM `{!_MYSQL_PREFIX!}_user_cats` AS c
LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON c.userid=d.userid
-WHERE c.cat_id=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$ADD."
+WHERE c.cat_id=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$add."
ORDER BY d.%s %s",
array(
bigintval(REQUEST_POST('cat')),
@@ -265,7 +265,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
if (!REQUEST_ISSET_POST(('zip'))) REQUEST_SET_POST('zip', "0");
// Check if he has enougth points for this order and selected more than 0 receivers
- if (($USED > 0) && ($USED <= $TOTAL) && ($MAX_SEND > 0)) {
+ if (($USED > 0) && ($USED <= $total) && ($MAX_SEND > 0)) {
// Gettings points is okay, so we can add $USED later from
$TIME = time();
if (($id == "0") || ($type != "TEMP")) {
@@ -399,7 +399,7 @@ array(
// Display order form
$result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
if (SQL_NUMROWS($result_cats) > 0) {
- if ($TOTAL > 0) {
+ if ($total > 0) {
// Initialize array...
$CATS = array(
'id' => array(),
@@ -478,7 +478,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
$typeS = array();
if (SQL_NUMROWS($result) > 0) {
// Check for message ID in URL
- $MSG = "";
+ $message = "";
switch (REQUEST_GET('msg'))
{
case getCode('URL_TLOCK'):
@@ -503,53 +503,53 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
// Finally contruct the message
// @TODO Rewrite this old lost code to a template
- $MSG = "{--MEMBER_URL_TIME_LOCK--}
{--CONFIG_URL_TLOCK--} ".$STD."
+ $message = "{--MEMBER_URL_TIME_LOCK--}
{--CONFIG_URL_TLOCK--} ".$STD."
{--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}
{--MEMBER_LAST_TLOCK--}: ".$LORDER;
break;
case getCode('OVERLENGTH'):
- $MSG = getMessage('MEMBER_TEXT_OVERLENGTH');
+ $message = getMessage('MEMBER_TEXT_OVERLENGTH');
break;
case getCode('URL_FOUND'):
- $MSG = getMessage('MEMBER_TEXT_CONTAINS_URL');
+ $message = getMessage('MEMBER_TEXT_CONTAINS_URL');
break;
case getCode('SUBJ_URL'):
- $MSG = getMessage('MEMBER_SUBJ_CONTAINS_URL');
+ $message = getMessage('MEMBER_SUBJ_CONTAINS_URL');
break;
case getCode('BLIST_URL'):
- $MSG = "{--MEMBER_URL_BLACK_LISTED--}
\n{--MEMBER_BLIST_TIME--}: ".MAKE_DATETIME(REQUEST_GET('blist'), "0");
+ $message = "{--MEMBER_URL_BLACK_LISTED--}
\n{--MEMBER_BLIST_TIME--}: ".MAKE_DATETIME(REQUEST_GET('blist'), "0");
break;
case getCode('NO_RECS_LEFT'):
- $MSG = getMessage('MEMBER_SELECTED_MORE_RECS');
+ $message = getMessage('MEMBER_SELECTED_MORE_RECS');
break;
case getCode('INVALID_TAGS'):
- $MSG = getMessage('MEMBER_HTML_INVALID_TAGS');
+ $message = getMessage('MEMBER_HTML_INVALID_TAGS');
break;
case getCode('MORE_POINTS'):
- $MSG = getMessage('MEMBER_MORE_POINTS_NEEDED');
+ $message = getMessage('MEMBER_MORE_POINTS_NEEDED');
break;
case getCode('MORE_RECEIVERS1'):
- $MSG = getMessage('MEMBER_ENTER_MORE_RECEIVERS');
+ $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS');
break;
case getCode('MORE_RECEIVERS2'):
- $MSG = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND');
+ $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND');
break;
case getCode('MORE_RECEIVERS3'):
- $MSG = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min'));
+ $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min'));
break;
case getCode('INVALID_URL'):
- $MSG = getMessage('MEMBER_ENTER_INVALID_URL');
+ $message = getMessage('MEMBER_ENTER_INVALID_URL');
break;
case "": // When no error code is included in the URL we do not need to output an error message as well...
@@ -557,13 +557,13 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
default:
DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error code %s detected.", REQUEST_GET('msg')));
- $MSG = sprintf(getMessage('UNKNOWN_CODE'), REQUEST_GET('msg'));
+ $message = sprintf(getMessage('UNKNOWN_CODE'), REQUEST_GET('msg'));
break;
}
- if (!empty($MSG)) {
+ if (!empty($message)) {
// We got system message so we drop it out to the user
- LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+ LOAD_TEMPLATE("admin_settings_saved", false, $message);
} // END - if
// Load all email types...
@@ -575,7 +575,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
SQL_FREERESULT($result);
// Output user's points
- $TOTAL = TRANSLATE_COMMA($TOTAL);
+ $total = TRANSLATE_COMMA($total);
// Check how many mail orders he has placed today and how many he's allowed to send
switch (getConfig('order_max_full'))
@@ -595,7 +595,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
}
// Load final template
- LOAD_TEMPLATE("member_order_points", false, $TOTAL);
+ LOAD_TEMPLATE("member_order_points", false, $total);
// Reset variables
$OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
@@ -671,10 +671,10 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
LOAD_TEMPLATE("member_order_page2");
} else {
// Remember maybe entered ZIP code in constant
- $ADD = "";
+ $add = "";
if (EXT_IS_ACTIVE("html_mail")) {
// Add some content when html extension is active
- if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $ADD = "| |
\n";
+ if ((getConfig('order_multi_page') == "Y") || (IS_ADMIN())) $add = "| |
\n";
define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));
} else {
// No HTML extension installed
@@ -687,12 +687,12 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
if (REQUEST_POST('zip') > 0) {
$content = array(
'zip' => bigintval(REQUEST_POST('zip')),
- 'add' => $ADD
+ 'add' => $add
);
} else {
$content = array(
'zip' => "",
- 'add' => $ADD
+ 'add' => $add
);
}
define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE("member_order-zip1", true, $content));