X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=1b1dd1984c29df084f31ad63e4dd97a93faa967c;hp=491160aa2d8c248099366f935e07c035f04d93b2;hb=6c0abc9f643c69610fe87be0ddb1a5dab95c6d39;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 491160aa2d..1b1dd1984c 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -1,7 +1,7 @@
= '0.1.3')) {
- // Fetch also holiday activation data
- $HOLIDAY = '`holiday_active`';
-} // END - if
+$links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true);
-$result_mmails = SQL_QUERY_ESC("SELECT `userid`, `receive_mails`, `mail_orders`, ".$HOLIDAY."
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `userid`=%s AND `max_mails` > 0 LIMIT 1",
- array(getUserId()), __FILE__, __LINE__);
-
-$mmails = SQL_NUMROWS($result_mmails);
-list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
-SQL_FREERESULT($result_mmails);
-if ($HOLIDAY == $DMY) $HOLIDAY='N';
-
-$ALLOWED = $MAXI - $ORDERS;
-if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
+$ALLOWED = getUserData('receive_mails') - getUserData('mail_orders');
+if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails');
// Now check his points amount
-$total = countSumTotalData(getUserId(), 'user_points', 'points') - countSumTotalData(getUserId(), 'user_data', 'used_points');;
+$total = getTotalPoints(getMemberId());
-if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
// Holiday is active!
- loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE'));
-} elseif ((isPostRequestElementSet(('frametester'))) && ($ALLOWED > 0) && (postRequestElement('receiver') > 0)) {
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
+} elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('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...
@@ -97,15 +72,16 @@ if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) {
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `sender`=%s AND `url`='%s' AND `timestamp` > (UNIX_TIMESTAMP() - %s)
+ `sender`=%s AND
+ `url`='%s' AND
+ `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})
LIMIT 1",
array(
- getUserId(),
- postRequestElement('url'),
- getConfig('url_tlock')
+ getMemberId(),
+ postRequestParameter('url')
), __FILE__, __LINE__);
- $type = 'TEMP'; $id = 0;
+ $type = 'TEMP'; $id = '0';
if (SQL_NUMROWS($result) == 1) {
// Load id and mail type
list($id, $type) = SQL_FETCHROW($result);
@@ -117,31 +93,31 @@ LIMIT 1",
if ($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 = '';
- if (getConfig('test_text') == 'Y') {
+ $url = '';
+ if (getConfig('allow_url_in_text') == 'Y') {
// Test submitted text against some filters (length, URLs in text etc.)
- if ((strpos(strtolower(postRequestElement('text')), "https://") > -1) || (strpos(strtolower(postRequestElement('text')), 'http://') > -1) || (strpos(strtolower(postRequestElement('text')), "www") > -1)) {
+ if ((strpos(strtolower(postRequestParameter('text')), 'https://') > -1) || (strpos(strtolower(postRequestParameter('text')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('text')), "www") > -1)) {
// URL found!
- $URL = 'modules.php?module=login&what=order&code=' . getCode('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", '', postRequestElement('text')));
+ $TEST = str_replace("\n", '', str_replace("\r", '', postRequestParameter('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');
+ $url = 'modules.php?module=login&what=order&code=' . getCode('OVERLENGTH');
} // END - if
} // END - if
// Shall I test the subject line against URLs?
- if (getConfig('test_subj') == 'Y') {
+ if (getConfig('allow_url_in_subject') == 'Y') {
// Check the subject line for issues
- setRequestPostElement('subject', str_replace("\\", '[nl]', substr(postRequestElement('subject'), 0, 200)));
- if ((strpos(strtolower(postRequestElement('subject')), 'http://') > -1) || (strpos(strtolower(postRequestElement('subject')), "www") > -1)) {
+ setPostRequestParameter('subject', str_replace("\\", '[nl]', substr(postRequestParameter('subject'), 0, 200)));
+ if ((strpos(strtolower(postRequestParameter('subject')), 'http://') > -1) || (strpos(strtolower(postRequestParameter('subject')), "www") > -1)) {
// URL in subject found
- $URL = 'modules.php?module=login&what=order&code=' . getCode('SUBJ_URL');
+ $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL');
} // END - if
} // END - if
@@ -149,14 +125,14 @@ LIMIT 1",
if (getConfig('url_blacklist') == 'Y') {
// 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__);
+ array(postRequestParameter('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;
+ $url = 'modules.php?module=login&what=order&code=' . getCode('BLIST_URL') . '&blist=' . $blist;
} // END - if
// Free result
@@ -164,43 +140,51 @@ LIMIT 1",
} // END - if
// Enougth receivers entered?
- if ((postRequestElement('receiver') < getConfig('order_min')) && (!isAdmin())) {
+ if ((postRequestParameter('receiver') < getConfig('order_min')) && (!isAdmin())) {
// Less than allowed receivers entered!
- $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3');
+ $url = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS3');
} // END - if
// Validate URL
- if (!isUrlValid(postRequestElement('url'))) {
+ if (!isUrlValid(postRequestParameter('url'))) {
// URL is invalid!
- $URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_URL');
+ $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 (postRequestElement('html') == 'Y') {
+ if (postRequestParameter('html') == 'Y') {
// Chek for valid HTML tags
- setRequestPostElement('text', checkHtmlTags(postRequestElement('text')));
+ setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text')));
// Maybe invalid tags found?
- if (!isPostRequestElementSet('text')) $URL = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
+ if (!isPostRequestParameterSet('text')) $url = 'modules.php?module=login&what=order&code=' . getCode('INVALID_TAGS')."&id=".$id;
} else {
// Remove any HTML code
- setRequestPostElement('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestElement('text'))));
+ 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;
+ $url = 'modules.php?module=login&what=order&code=' . getCode('URL_TLOCK') . '&id=' . $id;
}
// Still no error?
- if (empty($URL)) {
+ if (empty($url)) {
// Check if category and number of receivers is okay
$add = '';
- if ((getConfig('order_multi_page') == 'Y') && (isPostRequestElementSet('zip'))) {
+ if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
// Choose recipients by ZIP code
- $add = " AND d.zip LIKE '".bigintval(postRequestElement('zip'))."{PER}'";
+ $add = sprintf(" AND d.zip LIKE '%s%%'",
+ bigintval(postRequestParameter('zip'))
+ );
} // END - if
// Check for userids
@@ -213,29 +197,26 @@ LEFT JOIN
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(
- bigintval(postRequestElement('cat')),
- getUserId(),
+ bigintval(postRequestParameter('cat')),
+ getMemberId(),
getConfig('order_select'),
getConfig('order_mode'),
), __FILE__, __LINE__);
// Do we enougth receivers left?
- if (SQL_NUMROWS($result) >= postRequestElement('receiver')) {
- // Check for holiday extensions
- $HOLIDAY = false;
- if (getExtensionVersion('holiday') >= '0.1.3') {
- // Include checking for users in holiday
- $HOLIDAY = true;
- } // END - if
-
+ if (SQL_NUMROWS($result) >= postRequestParameter('receiver')) {
// Load receivers from database
- $TEST = array(); $cnt = 0;
- while ($content = SQL_FETCHARRAY($result)) {
- if ($HOLIDAY) {
+ $TEST = array(); $cnt = '0';
+ while ($holidayContent = SQL_FETCHARRAY($result)) {
+ if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
// Check for his holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
`id`
@@ -244,16 +225,16 @@ FROM
WHERE
`userid`=%s AND `holiday_start` < UNIX_TIMESTAMP() AND `holiday_end` > UNIX_TIMESTAMP()
LIMIT 1",
- array(bigintval($content['userid'])), __FILE__, __LINE__);
- if (SQL_NUMROWS($result_holiday) == 1) $content['userid'] = 0; // Exclude user who are in holiday
+ array($holidayContent['userid']), __FILE__, __LINE__);
+ if (SQL_NUMROWS($result_holiday) == 1) $holidayContent['userid'] = '0'; // Exclude user who are in holiday
// Free memory
SQL_FREERESULT($result_holiday);
} // END - if
- if ($content['userid'] > 0) {
+ if ($holidayContent['userid'] > 0) {
// Add receiver
- $TEST[] = $content['userid'];
+ $TEST[] = $holidayContent['userid'];
$cnt++;
} // END - if
} // END - while
@@ -262,63 +243,60 @@ LIMIT 1",
SQL_FREERESULT($result);
// Implode array into string for the sending pool
- $RECEIVER = implode($TEST, ';');
+ $receiver = implode($TEST, ';');
// Count array for maximum sent
- $MAX_SEND = count($TEST);
+ $content['target_send'] = count($TEST);
// Update receiver list
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
- array(str_replace(';', ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
+ array(convertReceivers($receiver), $content['target_send']), __FILE__, __LINE__);
// Is calculated max receivers larger than wanted receivers then reset it
- if ($MAX_SEND > postRequestElement('receiver')) $MAX_SEND = bigintval(postRequestElement('receiver'));
+ if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
// Calculate used points
- $USED = $MAX_SEND * getPaymentPoints(bigintval(postRequestElement('type')));
+ $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
// Fix empty zip code
- if (!isPostRequestElementSet('zip')) setRequestPostElement('zip', '0');
+ if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
// Check if he has enougth points for this order and selected more than 0 receivers
- if (($USED > 0) && ($USED <= $total) && ($MAX_SEND > 0)) {
+ if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
// Gettings points is okay, so we can add $USED later from
- $TIME = time();
if (($id == '0') || ($type != 'TEMP')) {
// New order
- $id = 0;
+ $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','%s','%s','%s','%s','%s','%s')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
array(
- getUserId(),
- postRequestElement('subject'),
- postRequestElement('text'),
- $RECEIVER,
- bigintval(postRequestElement('type')),
- $TIME,
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $MAX_SEND,
- bigintval(postRequestElement('zip')),
- postRequestElement('html')
+ getMemberId(),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
+ $receiver,
+ bigintval(postRequestParameter('mail_type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
+ $content['target_send'],
+ 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','%s','%s','%s','%s','%s')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
array(
- getUserId(),
- postRequestElement('subject'),
- postRequestElement('text'),
- $RECEIVER,
- bigintval(postRequestElement('type')),
- $TIME,
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $MAX_SEND,
- bigintval(postRequestElement('zip')),
+ getMemberId(),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
+ $receiver,
+ bigintval(postRequestParameter('mail_type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
+ $content['target_send'],
+ bigintval(postRequestParameter('zip'), true, false),
), __FILE__, __LINE__);
}
} else {
@@ -342,15 +320,15 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestElement('subject'),
- postRequestElement('text'),
- $RECEIVER,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $MAX_SEND,
- bigintval(postRequestElement('zip')),
- postRequestElement('html'),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
+ $receiver,
+ bigintval(postRequestParameter('mail_type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
+ $content['target_send'],
+ bigintval(postRequestParameter('zip')),
+ postRequestParameter('html'),
bigintval($id)
), __FILE__, __LINE__);
} else {
@@ -371,55 +349,63 @@ WHERE
`id`=%s
LIMIT 1",
array(
- postRequestElement('subject'),
- postRequestElement('text'),
- $RECEIVER,
- bigintval(postRequestElement('type')),
- postRequestElement('url'),
- bigintval(postRequestElement('cat')),
- $MAX_SEND,
- bigintval(postRequestElement('zip')),
+ postRequestParameter('subject'),
+ postRequestParameter('text'),
+ $receiver,
+ bigintval(postRequestParameter('mail_type')),
+ postRequestParameter('url'),
+ bigintval(postRequestParameter('cat')),
+ $content['target_send'],
+ bigintval(postRequestParameter('zip')),
bigintval($id)
), __FILE__, __LINE__);
}
}
- // Do we need to get the ID number?
- if ($id == 0) {
+ // 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`=%s LIMIT 1",
+ $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(
- getUserId(),
- postRequestElement('subject'),
- bigintval(postRequestElement('type')),
- $TIME
+ getMemberId(),
+ postRequestParameter('subject'),
+ bigintval(postRequestParameter('mail_type'))
), __FILE__, __LINE__);
+ // Get pool id
list($id) = SQL_FETCHROW($result);
+
+ // Free result
SQL_FREERESULT($result);
- }
+ } // END - if
- // 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 ($MAX_SEND == 0) {
+ // 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
- $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS2');
+ $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');
+ $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');
+ $url = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT');
}
}
-} elseif (postRequestElement('receiver') == '0') {
+} elseif (postRequestParameter('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')) {
+ $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, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
-} elseif (($links < getConfig('unconfirmed')) && ($mmails == '1')) {
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
+} elseif ($links < getConfig('unconfirmed')) {
+ // Show only enabled categories to the user ...
+ $whereStatement = " WHERE `visible`='Y'";
+
+ // ... but all to the admin
+ if (isAdmin()) $whereStatement = '';
+
// Display order form
$result_cats = SQL_QUERY("SELECT
`id`, `cat`
@@ -428,10 +414,10 @@ FROM
".$whereStatement."
ORDER BY
`sort` ASC", __FILE__, __LINE__);
- if (SQL_NUMROWS($result_cats) > 0) {
+ if (!SQL_HASZERONUMS($result_cats)) {
if ($total > 0) {
// Initialize array...
- $CATS = array(
+ $categories = array(
'id' => array(),
'name' => array(),
'userids' => array()
@@ -439,56 +425,65 @@ ORDER BY
// Enable HTML checking
// @TODO Rewrite this to a filter
- $HTML = ''; $HOLIDAY = false; $HOL_STRING = '';
- if ((isExtensionActive('html_mail')) && (postRequestElement('html') == 'Y')) $HTML = " AND `html`='Y'";
- if (getExtensionVersion('holiday') >= '0.1.3') {
+ $HTML = ''; $HOL_STRING = '';
+ if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
+ 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 ($content = SQL_FETCHARRAY($result_cats)) {
- $CATS['id'][] = bigintval($content['id']);
- $CATS['name'][] = $content['cat'];
+ while ($categoriesContent = SQL_FETCHARRAY($result_cats)) {
+ $categories['id'][] = bigintval($categoriesContent['id']);
+ $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($content['id']), getUserId()), __FILE__, __LINE__);
+ array(bigintval($categoriesContent['id']), getMemberId()), __FILE__, __LINE__);
- $userid_cnt = 0;
+ $userid_cnt = '0';
while (list($ucat) = SQL_FETCHROW($result_userids)) {
// Check for holiday system
- $HOL_ACTIVE = false;
- if ($HOLIDAY) {
+ $isHolidayActive = false;
+ if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
// Check user's holiday status
$result_holiday = SQL_QUERY_ESC("SELECT
- d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d
+ 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
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($ucat)), __FILE__, __LINE__);
- // Is holiday is active?
- $HOL_ACTIVE = (SQL_NUMROWS($result_holiday) == 1);
+ // Fetch entry
+ list($cnt) = SQL_FETCHROW($result);
// Free memory
SQL_FREERESULT($result_holiday);
+
+ // Is holiday is active?
+ $isHolidayActive = ($cont == 1);
} // END - if
- if ($HOL_ACTIVE === 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",
array(bigintval($ucat)), __FILE__, __LINE__);
- if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestElementSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
+ if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
+ // Get zip code
list($zip) = SQL_FETCHROW($result_ver);
- SQL_FREERESULT($result_ver);
- if (substr($zip, 0, strlen(postRequestElement('zip'))) == postRequestElement('zip')) {
+ if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
// Ok, ZIP part is found
$userid_cnt++;
} // END - if
@@ -496,12 +491,15 @@ LIMIT 1",
// Count numbers up!
$userid_cnt += SQL_NUMROWS($result_ver);
}
+
+ // Free result
+ SQL_FREERESULT($result_ver);
} // END - if
} // END - while
// Free memory
SQL_FREERESULT($result_userids);
- $CATS['userids'][] = $userid_cnt;
+ $categories['userids'][] = $userid_cnt;
} // END - while
// Free memory
@@ -510,10 +508,10 @@ LIMIT 1",
// 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__);
- $typeS = array();
- if (SQL_NUMROWS($result) > 0) {
- // Check for message ID in URL
- $message = getMessageFromErrorCode(getRequestElement('code'));
+ $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
@@ -521,7 +519,7 @@ LIMIT 1",
} // END - if
// Load all email types...
- while ($typeS[] = SQL_FETCHROW($result)) {
+ while ($types[] = SQL_FETCHROW($result)) {
// Nothing to do here... ;-)
} // END - while
@@ -534,16 +532,16 @@ LIMIT 1",
// Check how many mail orders he has placed today and how many he's allowed to send
switch (getConfig('order_max_full')) {
case 'MAX': // He is allowed to send as much as possible
- $content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_MAX');
+ $content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_MAX--}';
break;
case 'ORDER': // He is allowed to send as much as he setup the receiving value
- $content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, $MAXI);
+ $content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, getUserData('receive_mails'));
break;
default: // Unknown/invalid
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
- $content['order_max_full'] = sprintf(getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN'), getConfig('order_max_full'));
+ $content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_UNKNOWN--}';
break;
} // END - switch
@@ -562,80 +560,82 @@ LIMIT 1",
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `sender`=%s AND `data_type`='TEMP'
+ `sender`=%s AND
+ `data_type`='TEMP'
LIMIT 1",
- array(getUserId()), __FILE__, __LINE__);
+ array(getMemberId()), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Old order found
- $content = SQL_FETCHARRAY($result);
+ $content = merge_array($content, SQL_FETCHARRAY($result));
// Fix max receivers when it is too much
- if ((isset($CATS['userids'][$content['cat_id']])) && ($content['target_send'] > $CATS['userids'][$content['cat_id']])) $content['target_send'] = $CATS['userids'][$content['cat_id']];
+ if ((isset($categories['userids'][$content['cat_id']])) && ($content['target_send'] > $categories['userids'][$content['cat_id']])) {
+ // Fix it
+ $content['target_send'] = $categories['userids'][$content['cat_id']];
+ } // END - if
// Old order is grabbed
$OLD_ORDER = true;
} else {
// Default output for that your members don't forget it...
- $content['url'] = 'http://';
+ $content['url'] = 'http://';
+ $content['target_send'] = getConfig('order_min');
+ $content['subject'] = '{--ORDER_DEFAULT_SUBJECT--}';
+ $content['text'] = '{--ORDER_DEFAULT_TEXT--}';
}
// Free result
SQL_FREERESULT($result);
- if ((isPostRequestElementSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+ if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
// Pre-output categories
- $CAT = '';
- foreach ($CATS['id'] as $key => $value) {
- $CAT .= "