* $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 *
- * 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 *
// 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
$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')) {
// 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
} // 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
// 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
} 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') != '')) {
- // 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.%s %s",
+ d.`{?order_select?}` {?order_mode?}",
array(
- bigintval(postRequestParameter('cat')),
- getMemberId(),
- getConfig('order_select'),
- getConfig('order_mode'),
+ 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
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);
if ($holidayContent['userid'] > 0) {
// Add receiver
- $TEST[] = $holidayContent['userid'];
- $cnt++;
+ array_push($TEST, $holidayContent['userid']);
+ $count++;
} // END - if
} // END - while
// 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'] > 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')) {
`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 {
`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
// 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');
}
- }
-} elseif (postRequestParameter('receiver') == '0') {
+ } // END - if
+} 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'";
// 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(),
// 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'";
// ... 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);
+ 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 {
// 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')) {
// 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
} else {
// Default output for that your members don't forget it...
$content['url'] = 'http://';
- $content['target_send'] = getConfig('order_min');
- $content['subject'] = '{--ORDER_DEFAULT_SUBJECT--}';
- $content['text'] = '{--ORDER_DEFAULT_TEXT--}';
+ $content['target_send'] = '{?order_min?}';
+ $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'] .= ' <option value="' . $value . '"';
- if (($OLD_ORDER) && ($content['cat_id'] == $value)) $content['category_selection'] .= ' selected="selected"';
- $content['category_selection'] .= '>' . $categories['name'][$key]." (".$categories['userids'][$key] . ' {--USER_IN_CAT--})</option>';
- } // END - foreach
+ $content['category_selection'] = generateCategoryOptionsList(((isExtensionActive('html_mail')) && (isPostRequestElementSet('html'))) ? postRequestElement('html') : 'N', getMemberId());
// 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'] .= ' <option value="' . $types[$key][0] . '"';
- if (($OLD_ORDER) && ($content['payment_id'] == $types[$key][0])) $content['type_selection'] .= ' selected="selected"';
- $content['type_selection'] .= '>' . $P . ' {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
+ $content['type_selection'] .= ' <option value="' . $types[$key]['id'] . '"';
+ if (($OLD_ORDER) && ($content['payment_id'] == $types[$key]['id'])) $content['type_selection'] .= ' selected="selected"';
+ $content['type_selection'] .= '>{%pipe,translateComma=' . $types[$key]['price'] . '%} {--PER_MAIL--} - ' . $types[$key]['mail_title'] . ' - ' . round($types[$key]['payment']) . ' {--PAYMENT--}</option>';
} // END - if
} // END - foreach
// No content is default
$content['zip_content'] = '';
- if (isPostRequestParameterSet('zip')) {
+ if (isPostRequestElementSet('zip')) {
// Output entered ZIP code
- $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
+ $content['zip_content'] = loadTemplate('member_order_zip2', true, postRequestElement('zip'));
} // END - if
+ // No HTML extension installed by default
+ $content['html_extension'] = '<input type="hidden" name="html" value="N" />';
+
// HTML extension
- if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+ if ((isExtensionActive('html_mail')) && (postRequestElement('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'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
- }
+ $content['html_extension'] = loadTemplate('member_order_html_ext', true);
+ } // END - if
// Output form for page 2
loadTemplate('member_order_page2', false, $content);
} else {
+ // No HTML extension installed by default
+ $content['html_extension'] = '<input type="hidden" name="html" value="N" />';
+
// Remember maybe entered ZIP code in constant
if (isExtensionActive('html_mail')) {
// Add some content when html extension is active
- $content['html_extension'] = loadTemplate('member_order-html_intro', true);
- } else {
- // No HTML extension installed
- $content['html_extension'] = '<tr><td colspan="3"><input type="hidden" name="html" value="N" /></td></tr>';
- }
+ $content['html_extension'] = loadTemplate('member_order_html_intro', true);
+ } // END - if
// Default is no ZIP code
$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) {
+ if (postRequestElement('zip') > 0) {
$data = array(
- 'zip' => bigintval(postRequestParameter('zip'))
+ 'zip' => bigintval(postRequestElement('zip'))
);
} else {
$data = array(
'zip' => ''
);
}
- $content['zip_content'] = loadTemplate('member_order-zip1', true, $data);
+ $content['zip_content'] = loadTemplate('member_order_zip1', true, $data);
} // END - if
// Output form for page 1 (ZIP code or HTML)
}
} else {
// No mail types defined
- loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_PAYMENTS--}</span>');
+ displayMessage('<span class="bad">{--MEMBER_ORDER_NO_PAYMENTS--}</span>');
}
} else {
// No points left
- loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_POINTS--}</span>');
+ displayMessage('<span class="bad">{--MEMBER_ORDER_NO_POINTS--}</span>');
}
} else {
// No cateogries are defined yet
- loadTemplate('admin_settings_saved', false, '<span class="member_failed">{--MEMBER_NO_CATEGORIES--}</span>');
+ displayMessage('<span class="bad">{--MEMBER_NO_CATEGORIES--}</span>');
}
} else {
// Please confirm some mails first
- loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links);
+ displayMessage('<span class="notice">{%message,MEMBER_ORDER_LINKS_LEFT=' . getTotalUnconfirmedMails(getMemberId()) . '%}</span>');
}
if (!empty($url)) {
projects / mailer.git / blobdiff