* 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 *
* *
* This program is free software; you can redistribute it and/or modify *
// Do we have ext-holiday installed?
// @TODO Rewrite this to a filter
-$HOLIDAY = 'userid';
+$extraColumn = 'userid';
if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
// Fetch also holiday activation data
- $HOLIDAY = 'holiday_active';
+ $extraColumn = 'holiday_active';
} // END - if
$result_mmails = SQL_QUERY_ESC("SELECT
- `userid`, `receive_mails`, `mail_orders`, `".$HOLIDAY."`
+ `userid`, `receive_mails`, `mail_orders`, `".$extraColumn."`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
if (empty($URL)) {
// Check if category and number of receivers is okay
$add = '';
- if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip'))) {
+ if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
// Choose recipients by ZIP code
$add = " AND d.zip LIKE '".bigintval(postRequestParameter('zip'))."{PER}'";
} // END - if
// Do we enougth receivers left?
if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
- // Check for holiday extensions
- $HOLIDAY = false;
- if (getExtensionVersion('holiday') >= '0.1.3') {
- // Include checking for users in holiday
- $HOLIDAY = true;
- } // END - if
-
// Load receivers from database
$TEST = array(); $cnt = '0';
while ($holidayContent = SQL_FETCHARRAY($result)) {
- if ($HOLIDAY) {
+ if (getExtensionVersion('holiday') >= '0.1.3') {
// Check for his holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
`id`
// Enable HTML checking
// @TODO Rewrite this to a filter
- $HTML = ''; $HOLIDAY = false; $HOL_STRING = '';
+ $HTML = ''; $HOL_STRING = '';
if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
if (getExtensionVersion('holiday') >= '0.1.3') {
// Extension's version is fine
- $HOLIDAY = true; $HOL_STRING = " AND `holiday_active`='N'";
+ $HOL_STRING = " AND `holiday_active`='N'";
} // END - if
// ... and begin loading stuff
while (list($ucat) = SQL_FETCHROW($result_userids)) {
// Check for holiday system
$HOL_ACTIVE = false;
- if ($HOLIDAY) {
+ if (getExtensionVersion('holiday') >= '0.1.3') {
// Check user's holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
} // END - if
} // END - foreach
+ // No content is default
+ $content['zip_content'] = '';
+
if (isPostRequestParameterSet('zip')) {
// Output entered ZIP code
$content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip'));
- } else {
- $content['zip_content'] = '<tr><td colspan="3" height="5" class="seperator"> </td></tr>';
- }
+ } // END - if
// HTML extension
if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
loadTemplate('member_order_page2', false, $content);
} else {
// Remember maybe entered ZIP code in constant
- $add = '';
if (isExtensionActive('html_mail')) {
// Add some content when html extension is active
- if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) $add = '<tr><td colspan="3" class="seperator bottom" height="5"> </td></tr>';
$content['html_extension'] = loadTemplate('member_order-html_intro', true);
} else {
// No HTML extension installed
// Yes
if (postRequestParameter('zip') > 0) {
$data = array(
- 'zip' => bigintval(postRequestParameter('zip')),
- 'add' => $add
+ 'zip' => bigintval(postRequestParameter('zip'))
);
} else {
$data = array(
- 'zip' => '',
- 'add' => $add
+ 'zip' => ''
);
}
$content['zip_content'] = loadTemplate('member_order-zip1', true, $data);