* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * 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 *
// Some security stuff...
if (!defined('__SECURITY')) {
- die();
+ exit();
} elseif (!isMember()) {
redirectToIndexMemberOnlyModule();
}
return;
} // END - if
-$url = ''; $id = '0';
+// Init data
+$data = array(
+ 'id' => '0',
+ 'data_type' => 'TEMP',
+ 'url' => '',
+);
$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')) && (isUserDataEnabled('holiday_active'))) {
+// Admin can always book
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active')) && (!isAdmin())) {
// Holiday is active!
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
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);
+ $data = SQL_FETCHARRAY($result);
} // END - if
// Free result
SQL_FREERESULT($result);
- if ($type == 'TEMP') {
+ if ($data['data_type'] == 'TEMP') {
// No entry found, so we need to check out the stats table as well... :)
// We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters
- $url = '';
+ $data['url'] = '';
if (getConfig('allow_url_in_text') == 'Y') {
// Test submitted text against some filters (length, URLs in text etc.)
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');
+ $data['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", '', postRequestElement('text')));
+ $TEST = str_replace(array(PHP_EOL, chr(13)), array('', ''), postRequestElement('text'));
// Text length within allowed length?
if (strlen($TEST) > getConfig('max_tlength')) {
// Text is too long!
- $url = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
} // END - if
} // END - if
// Shall I test the subject line against URLs?
if (getConfig('allow_url_in_subject') == 'Y') {
// Check the subject line for issues
- setPostRequestElement('subject', str_replace("\\", '[nl]', substr(postRequestElement('subject'), 0, 200)));
+ 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');
+ $data['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 (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(postRequestElement('url')), __FILE__, __LINE__);
-
- if (SQL_NUMROWS($result) == 1) {
- // Jupp, we got one listed
- list($blist) = SQL_FETCHROW($result);
-
- // Create redirect-URL
- $url = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $blist;
- } // END - if
-
- // Free result
- SQL_FREERESULT($result);
+ if ((isExtensionActive('blacklist')) && (isUrlBlacklisted(postRequestElement('url')))) {
+ // Create redirect-URL
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $GLOBALS['blacklist_data'][postRequestElement('url')]['timestamp'];
} // END - if
// Enougth receivers entered?
if ((postRequestElement('receiver') < getConfig('order_min')) && (!isAdmin())) {
// Less than allowed receivers entered!
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3');
} // END - if
// Validate URL
if (!isUrlValid(postRequestElement('url'))) {
// URL is invalid!
- $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
} // END - if
// Probe for HTML extension
setPostRequestElement('text', checkHtmlTags(postRequestElement('text')));
// Maybe invalid tags found?
- if (!isPostRequestElementSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
+ if (!isPostRequestElementSet('text')) $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS') . '&id=' . $data['id'];
} else {
// Remove any HTML code
- setPostRequestElement('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestElement('text'))));
+ setPostRequestElement('text', str_replace(array('<', '>'), array('{OPEN_HTML}', '{CLOSE_HTML}'), postRequestElement('text')));
}
} // END - if
// Is mail type set?
if ((!isPostRequestElementSet('mail_type')) || (postRequestElement('mail_type') < 1)) {
// Not correctly set
- $url = 'modules.php?module=login&what=order&code=' . getCode('NO_MAIL_TYPE');
+ $data['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_TIME_LOCK') . '&id=' . $id;
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('URL_TIME_LOCK') . '&id=' . $data['id'];
}
// Still no error?
- if (empty($url)) {
- // Check if category and number of receivers is okay
- $add = '';
- if ((isOrderMultiPageEnabled()) && (isPostRequestElementSet('zip')) && (postRequestElement('zip') != '')) {
- // Choose recipients by ZIP code
- $add = sprintf(" AND d.zip LIKE '%s%%'",
- bigintval(postRequestElement('zip'))
- );
- } // END - if
-
+ if (empty($data['url'])) {
// Check for userids
$result = SQL_QUERY_ESC("SELECT
- c.userid
+ `c`.`userid`
FROM
- `{?_MYSQL_PREFIX?}_user_cats` AS c
-LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_data` AS d
+ `{?_MYSQL_PREFIX?}_user_cats` AS `c`
+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(postRequestElement('cat')),
getMemberId()
), __FILE__, __LINE__);
- // Do we enougth receivers left?
+ // Are there still receivers left?
if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
// Load receivers from database
$TEST = array(); $count = '0';
SQL_FREERESULT($result_holiday);
} // END - if
- if ($holidayContent['userid'] > 0) {
+ if (isValidId($holidayContent['userid'])) {
// Add receiver
- $TEST[] = $holidayContent['userid'];
+ array_push($TEST, $holidayContent['userid']);
$count++;
} // END - if
} // END - while
} // END - if
// Calculate used points
- $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestElement('mail_type')));
+ $usedPoints = $content['target_send'] * getPaymentData(bigintval(postRequestElement('mail_type')));
// Fix empty zip code
if (!isPostRequestElementSet('zip')) {
} // 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 (($id == '0') || ($type != 'TEMP')) {
+ if (($usedPoints > 0) && ($usedPoints <= $totalPoints) && ($content['target_send'] > 0)) {
+ // Gettings points is okay, so we can add $usedPoints later from
+ if ((!isValidId($data['id'])) || ($data['data_type'] != 'TEMP')) {
// New order
- $id = '0';
+ $data['id'] = '0';
if (isExtensionActive('html_mail')) {
// HTML extension is active
SQL_QUERY_ESC("INSERT INTO
postRequestElement('url'),
bigintval(postRequestElement('cat')),
bigintval($content['target_send']),
- bigintval(postRequestElement('zip'), true, false),
+ bigintval(postRequestElement('zip'), TRUE, FALSE),
postRequestElement('html')
), __FILE__, __LINE__);
} else {
postRequestElement('url'),
bigintval(postRequestElement('cat')),
bigintval($content['target_send']),
- bigintval(postRequestElement('zip'), true, false),
+ bigintval(postRequestElement('zip'), TRUE, FALSE),
), __FILE__, __LINE__);
}
+
+ // Get insert id
+ $data['id'] = SQL_INSERTID();
} else {
// Change current order
if (isExtensionActive('html_mail')) {
$content['target_send'],
bigintval(postRequestElement('zip')),
postRequestElement('html'),
- bigintval($id)
+ bigintval($data['id'])
), __FILE__, __LINE__);
} else {
// No HTML extension is active
bigintval(postRequestElement('cat')),
$content['target_send'],
bigintval(postRequestElement('zip')),
- bigintval($id)
+ bigintval($data['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(),
- postRequestElement('subject'),
- bigintval(postRequestElement('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(isValidId($data['id']));
- // 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;
+ // Id is received so we can redirect the user, used points will be added when he send's out the mail
+ $data['url'] = 'modules.php?module=frametester&order=' . $data['id'];
} elseif ($content['target_send'] == '0') {
// Not enougth receivers found which can receive mails
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2');
} else {
// No enougth points left!
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_POINTS');
}
} else {
// Ordered more mails than he can send in this category
- $url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
}
} // END - if
} elseif (postRequestElement('receiver') == '0') {
// Not enougth receivers selected
- $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
+ $data['url'] = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1');
} elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
// No more mail orders allowed
displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
if (isAdmin()) $whereStatement = '';
// Display order form
- $result_cats = SQL_QUERY("SELECT
- `id`,`cat`
+ $result_cats = SQL_QUERY('SELECT
+ `id`,
+ `cat`
FROM
`{?_MYSQL_PREFIX?}_cats`
-".$whereStatement."
+' . $whereStatement . '
ORDER BY
- `sort` ASC", __FILE__, __LINE__);
+ `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(),
// ... 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",
+ $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($userid) = SQL_FETCHROW($result_userids)) {
// Check for holiday system
- $isHolidayActive = false;
+ $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
+ `{?_MYSQL_PREFIX?}_user_data` AS `d`
LEFT JOIN
- `{?_MYSQL_PREFIX?}_user_holidays` AS h
+ `{?_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.`status`='CONFIRMED' AND
- d.`holiday_active`='Y' AND
- h.holiday_start < UNIX_TIMESTAMP() AND
- h.holiday_end > UNIX_TIMESTAMP()
+ `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()
LIMIT 1",
array(bigintval($userid)), __FILE__, __LINE__);
$isHolidayActive = ($count == 1);
} // END - if
- if ($isHolidayActive === false) {
+ 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",
+ $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($userid)), __FILE__, __LINE__);
if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (isOrderMultiPageEnabled())) {
// 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();
+ $payments = array();
if (!SQL_HASZERONUMS($result)) {
- // Check for message id in URL
- $message = getMessageFromErrorCode(getRequestElement('code'));
-
- if (!empty($message)) {
- // We got system message so we drop it out to the user
- displayMessage($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 ($payment = SQL_FETCHARRAY($result)) {
+ array_push($payments, $payment);
} // END - while
// Free memory
SQL_FREERESULT($result);
// Output user's points
- $content['total_points'] = $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')) {
} // END - switch
// Load final template
- loadTemplate('member_order_points', false, $content);
+ loadTemplate('member_order_points', FALSE, $content);
// Reset variables
- $OLD_ORDER = false;
+ $OLD_ORDER = FALSE;
$subject = '';
$text = '';
$target = '';
// 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
} // END - if
// Old order is grabbed
- $OLD_ORDER = true;
+ $OLD_ORDER = TRUE;
} else {
// 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
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) {
+ foreach ($payments as $key => $value) {
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'] .= '>{%pipe,translateComma=' . $types[$key][1] . '%} {--PER_MAIL--} - ' . $types[$key][3] . ' - ' . round($types[$key][2]) . ' {--PAYMENT--}</option>';
+ $content['type_selection'] .= ' <option value="' . $payments[$key]['id'] . '"';
+ if (($OLD_ORDER) && ($content['payment_id'] == $payments[$key]['id'])) $content['type_selection'] .= ' selected="selected"';
+ $content['type_selection'] .= '>{%pipe,translateComma=' . $payments[$key]['price'] . '%} {--PER_MAIL--} - ' . $payments[$key]['mail_title'] . ' - ' . round($payments[$key]['payment']) . ' {--PAYMENT--}</option>';
} // END - if
} // END - foreach
if (isPostRequestElementSet('zip')) {
// Output entered ZIP code
- $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestElement('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')) && (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);
+ 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?
+ // Is sending to ZIP code enabled? (logged-in admin can always send to it)
if ((isOrderMultiPageEnabled()) || (isAdmin())) {
// Yes
if (postRequestElement('zip') > 0) {
'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)
- loadTemplate('member_order_page1', false, $content);
+ loadTemplate('member_order_page1', FALSE, $content);
}
} else {
// No mail types defined
displayMessage('<span class="notice">{%message,MEMBER_ORDER_LINKS_LEFT=' . getTotalUnconfirmedMails(getMemberId()) . '%}</span>');
}
-if (!empty($url)) {
+if (!empty($data['url'])) {
// Redirect to requested URL
- redirectToUrl($url);
+ redirectToUrl($data['url']);
} // END - if
// [EOF]
projects / mailer.git / blobdiff