X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=1180b53707d866c478b8926d5244ab6440d3970d;hp=d1d18a245a857021b43c9bd5894863959f945938;hb=8fad776382e63b3f73f8dbe289f229d79cfc2c22;hpb=37a43f2538a0555c2e3dd35b3582d339bc284420 diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index d1d18a245a..1180b53707 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2012 by Mailer Developer Team * + * 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 * @@ -35,53 +35,53 @@ // Some security stuff... if (!defined('__SECURITY')) { - die(); + exit(); } elseif (!isMember()) { redirectToIndexMemberOnlyModule(); } // 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); - $ALLOWED = getUserData('receive_mails') - getUserData('mail_orders'); if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails'); // Now check his points amount -$total = getTotalPoints(getMemberId()); +$totalPoints = 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--}'); -} elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) { + displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}'); +} 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 `sender`=%s AND `url`='%s' AND - `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?}) + (UNIX_TIMESTAMP() - `timestamp`) >= {?url_tlock?} LIMIT 1", array( getMemberId(), - postRequestParameter('url') + postRequestElement('url') ), __FILE__, __LINE__); $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 @@ -94,13 +94,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)) { - // URL found! + 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(array(chr(10), chr(13)), array('', ''), postRequestElement('text')); // Text length within allowed length? if (strlen($TEST) > getConfig('max_tlength')) { @@ -112,18 +112,18 @@ 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(chr(92), '[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 } // 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__); + array(postRequestElement('url')), __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Jupp, we got one listed @@ -138,13 +138,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 @@ -152,20 +152,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(array('<', '>'), array('{OPEN_HTML}', '{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 @@ -176,41 +176,32 @@ LIMIT 1", // 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') != '')) { - // Choose recipients by ZIP code - $add = sprintf(" AND d.zip LIKE '%s%%'", - bigintval(postRequestParameter('zip')) - ); - } // END - if - // Check for userids $result = SQL_QUERY_ESC("SELECT - c.userid + c.`userid` FROM `{?_MYSQL_PREFIX?}_user_cats` AS c -LEFT JOIN +INNER JOIN `{?_MYSQL_PREFIX?}_user_data` AS d ON - c.userid=d.userid + c.`userid`=d.`userid` WHERE - c.cat_id=%s AND - c.userid != '%s' AND - d.`status`='CONFIRMED' AND - d.receive_mails > 0 - ".$add." + c.`cat_id`=%s AND + c.`userid` != %s AND + d.`status`='CONFIRMED' + " . runFilterChain('user_exclusion_sql', ' ') . " AND + d.`receive_mails` > 0 ORDER BY - d.{?order_select?} {?order_mode?}", + 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')) { + // Are there still receivers left? + if (SQL_NUMROWS($result) >= postRequestElement('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 @@ -219,10 +210,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); @@ -230,8 +226,8 @@ LIMIT 1", if ($holidayContent['userid'] > 0) { // Add receiver - $TEST[] = $holidayContent['userid']; - $cnt++; + array_push($TEST, $holidayContent['userid']); + $count++; } // END - if } // END - while @@ -248,56 +244,115 @@ LIMIT 1", 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'] + 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'] > postRequestElement('receiver')) { + $content['target_send'] = bigintval(postRequestElement('receiver')); + } // END - if // Calculate used points - $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type'))); + $usedPoints = $content['target_send'] * getPaymentData(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 - if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) { - // Gettings points is okay, so we can add $USED later from + if (($usedPoints > 0) && ($usedPoints <= $totalPoints) && ($content['target_send'] > 0)) { + // Gettings points is okay, so we can add $usedPoints later from if (($id == '0') || ($type != 'TEMP')) { // New order $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'), - postRequestParameter('text'), + postRequestElement('subject'), + postRequestElement('text'), $receiver, - bigintval(postRequestParameter('mail_type')), - postRequestParameter('url'), - bigintval(postRequestParameter('cat')), - $content['target_send'], - bigintval(postRequestParameter('zip'), true, false), - postRequestParameter('html') + bigintval(postRequestElement('mail_type')), + postRequestElement('url'), + bigintval(postRequestElement('cat')), + bigintval($content['target_send']), + bigintval(postRequestElement('zip'), true, false), + postRequestElement('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'), - postRequestParameter('text'), + postRequestElement('subject'), + postRequestElement('text'), $receiver, - bigintval(postRequestParameter('mail_type')), - postRequestParameter('url'), - bigintval(postRequestParameter('cat')), - $content['target_send'], - bigintval(postRequestParameter('zip'), true, false), + bigintval(postRequestElement('mail_type')), + postRequestElement('url'), + bigintval(postRequestElement('cat')), + bigintval($content['target_send']), + bigintval(postRequestElement('zip'), true, false), ), __FILE__, __LINE__); } + + // Get insert id + $id = SQL_INSERTID(); } else { // Change current order if (isExtensionActive('html_mail')) { @@ -319,15 +374,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 { @@ -348,37 +403,23 @@ 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__); } } - // Do we need to get the id number? - if ($id == '0') { - // Order is placed as temporary. We need to get it's id for the frametester - $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')) - ), __FILE__, __LINE__); - - // Get pool id - list($id) = SQL_FETCHROW($result); - - // Free result - SQL_FREERESULT($result); - } // END - if + // Make sure only valid id numbers can pass + assert((!is_bool($id)) && ($id > 0)); - // id is received so we can redirect the user, used points will be added when he send's out the mail + // Id is received so we can redirect the user, used points will be added when he send's out the mail $url = 'modules.php?module=frametester&order=' . $id; } elseif ($content['target_send'] == '0') { // Not enougth receivers found which can receive mails @@ -392,13 +433,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 - loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}'); -} elseif ($links < getConfig('unconfirmed')) { + displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}'); +} elseif (getTotalUnconfirmedMails(getMemberId()) < getConfig('unconfirmed')) { // Show only enabled categories to the user ... $whereStatement = " WHERE `visible`='Y'"; @@ -407,14 +448,18 @@ LIMIT 1", // Display order form $result_cats = SQL_QUERY("SELECT - `id`, `cat` + `id`, + `cat` FROM `{?_MYSQL_PREFIX?}_cats` ".$whereStatement." ORDER BY `sort` ASC", __FILE__, __LINE__); + + // Some categories found? if (!SQL_HASZERONUMS($result_cats)) { - if ($total > 0) { + // Enought points left? + if ($totalPoints > 0) { // Initialize array... $categories = array( 'id' => array(), @@ -425,7 +470,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')) && (postRequestElement('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'"; @@ -434,56 +481,56 @@ ORDER BY // ... and begin loading stuff while ($categoriesContent = SQL_FETCHARRAY($result_cats)) { $categories['id'][] = bigintval($categoriesContent['id']); - $categories['name'][] = $categoriesContent['cat']; + array_push($categories['name'], $categoriesContent['cat']); // Select users in current category $result_userids = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s AND `userid` != '%s' ORDER BY `userid` ASC", 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')) { // Check user's holiday status $result_holiday = SQL_QUERY_ESC("SELECT - COUNT(d.userid) AS `cnt` + COUNT(d.`userid`) AS `cnt` FROM `{?_MYSQL_PREFIX?}_user_data` AS d LEFT JOIN `{?_MYSQL_PREFIX?}_user_holidays` AS h ON - d.userid=h.userid + d.`userid`=h.`userid` WHERE - d.userid=%s AND - d.receive_mails > 0 AND + d.`userid`=%s AND + d.`receive_mails` > 0 AND d.`status`='CONFIRMED' AND d.`holiday_active`='Y' AND - h.holiday_start < UNIX_TIMESTAMP() AND - h.holiday_end > UNIX_TIMESTAMP() + 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_holiday); + 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) && (isPostRequestElementSet('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 + if (substr($zip, 0, strlen(postRequestElement('zip'))) == postRequestElement('zip')) { + // Ok, ZIP code part is found $userid_cnt++; } // END - if } else { @@ -498,35 +545,33 @@ LIMIT 1", // Free memory SQL_FREERESULT($result_userids); - $categories['userids'][] = $userid_cnt; + array_push($categories['userids'], $userid_cnt); } // END - while // Free memory 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')); - - if (!empty($message)) { - // We got system message so we drop it out to the user - loadTemplate('admin_settings_saved', false, $message); + // Is the error code set? + if (isGetRequestElementSet('code')) { + // Display error message + displayMessage(getMessageFromErrorCode(getRequestElement('code'))); } // END - if // Load all email types... - while ($types[] = SQL_FETCHROW($result)) { - // Nothing to do here... ;-) + while ($type = SQL_FETCHARRAY($result)) { + array_push($types, $type); } // END - while // Free memory SQL_FREERESULT($result); // Output user's points - $content['total'] = translateComma($total); + $content['total_points'] = $totalPoints; // Check how many mail orders he has placed today and how many he's allowed to send switch (getConfig('order_max_full')) { @@ -555,7 +600,14 @@ 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,79 +632,73 @@ LIMIT 1", // Default output for that your members don't forget it... $content['url'] = 'http://'; $content['target_send'] = '{?order_min?}'; - $content['subject'] = '{--ORDER_DEFAULT_SUBJECT--}'; - $content['text'] = '{--ORDER_DEFAULT_TEXT--}'; + $content['subject'] = ''; + $content['text'] = ''; } // Free result SQL_FREERESULT($result); - if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != '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'] .= '