* 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
// Remove any HTML code
setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
}
- }
+ } // END - if
+
+ // Is mail type set?
+ if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('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;
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
ON
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' AND
+ d.receive_mails > 0
+ ".$add."
ORDER BY
d.%s %s",
array(
// 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`
if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
// Calculate used points
- $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('type')));
+ $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
// Fix empty zip code
if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 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')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
array(
getMemberId(),
postRequestParameter('subject'),
postRequestParameter('text'),
$receiver,
- bigintval(postRequestParameter('type')),
+ bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestParameter('zip')),
+ bigintval(postRequestParameter('zip'), true false),
postRequestParameter('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')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
array(
getMemberId(),
postRequestParameter('subject'),
postRequestParameter('text'),
$receiver,
- bigintval(postRequestParameter('type')),
+ bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
$content['target_send'],
- bigintval(postRequestParameter('zip')),
+ bigintval(postRequestParameter('zip'), true false),
), __FILE__, __LINE__);
}
} else {
postRequestParameter('subject'),
postRequestParameter('text'),
$receiver,
- bigintval(postRequestParameter('type')),
+ bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
$content['target_send'],
postRequestParameter('subject'),
postRequestParameter('text'),
$receiver,
- bigintval(postRequestParameter('type')),
+ bigintval(postRequestParameter('mail_type')),
postRequestParameter('url'),
bigintval(postRequestParameter('cat')),
$content['target_send'],
array(
getMemberId(),
postRequestParameter('subject'),
- bigintval(postRequestParameter('type'))
+ bigintval(postRequestParameter('mail_type'))
), __FILE__, __LINE__);
// Get pool 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') {
+ if (isExtensionInstalledAndNewer('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
projects / mailer.git / blobdiff