X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=eedeef39b2e2c8c34c7f0d3ffb7d6e688bf783fd;hb=e78eede1b3ad977f89c45effc9a4ef1275d90214;hp=4a5a4ef831cb6787c6c2b83c90461105eacfca54;hpb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;p=mailer.git diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 4a5a4ef831..eedeef39b2 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -44,35 +44,32 @@ if (!defined('__SECURITY')) { 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()); -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--}'); + displayMessage('{--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... - $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(), @@ -82,6 +79,7 @@ LIMIT 1", $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 @@ -94,8 +92,8 @@ LIMIT 1", $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://', postRequestParameter('text'))) || (isInStringIgnoreCase('http://', postRequestParameter('text'))) || (isInStringIgnoreCase('www', postRequestParameter('text')))) { + // URL found $url = 'modules.php?module=login&what=order&code=' . getCode('URL_FOUND'); } // END - if @@ -113,7 +111,7 @@ LIMIT 1", 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)) { + if ((isInStringIgnoreCase('https://', postRequestParameter('subject'))) || (isInStringIgnoreCase('http://', postRequestParameter('subject'))) || (isInStringIgnoreCase('www', postRequestParameter('subject')))) { // URL in subject found $url = 'modules.php?module=login&what=order&code=' . getCode('SUBJECT_URL'); } // END - if @@ -178,7 +176,7 @@ LIMIT 1", if (empty($url)) { // Check if category and number of receivers is okay $add = ''; - if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) { + if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) { // Choose recipients by ZIP code $add = sprintf(" AND d.zip LIKE '%s%%'", bigintval(postRequestParameter('zip')) @@ -219,10 +217,15 @@ ORDER BY 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); @@ -248,17 +251,21 @@ LIMIT 1", 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'] + 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'] > postRequestParameter('receiver')) { + $content['target_send'] = bigintval(postRequestParameter('receiver')); + } // END - if // Calculate used points $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type'))); // Fix empty zip code - if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0); + if (!isPostRequestParameterSet('zip')) { + setPostRequestParameter('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)) { @@ -268,8 +275,35 @@ LIMIT 1", $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'), @@ -278,14 +312,39 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')", bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), - $content['target_send'], + bigintval($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',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'), @@ -294,7 +353,7 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)", bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), - $content['target_send'], + bigintval($content['target_send']), bigintval(postRequestParameter('zip'), true, false), ), __FILE__, __LINE__); } @@ -397,8 +456,8 @@ LIMIT 1", $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'"; @@ -407,7 +466,7 @@ LIMIT 1", // Display order form $result_cats = SQL_QUERY("SELECT - `id`, `cat` + `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats` ".$whereStatement." @@ -425,7 +484,9 @@ ORDER BY // 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')) && (postRequestParameter('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'"; @@ -479,7 +540,7 @@ 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) && (isPostRequestParameterSet('zip')) && (getConfig('order_multi_page') == 'Y')) { + if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) { // Get zip code list($zip) = SQL_FETCHROW($result_ver); if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) { @@ -505,7 +566,7 @@ LIMIT 1", 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)) { @@ -514,7 +575,7 @@ LIMIT 1", if (!empty($message)) { // We got system message so we drop it out to the user - loadTemplate('admin_settings_saved', false, $message); + displayMessage($message); } // END - if // Load all email types... @@ -526,7 +587,7 @@ LIMIT 1", SQL_FREERESULT($result); // Output user's points - $content['total'] = $total; + $content['total_points'] = $total; // Check how many mail orders he has placed today and how many he's allowed to send switch (getConfig('order_max_full')) { @@ -555,7 +616,7 @@ LIMIT 1", // 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 @@ -587,7 +648,7 @@ LIMIT 1", // Free result SQL_FREERESULT($result); - if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) { + if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) { // Pre-output categories $content['category_selection'] = ''; foreach ($categories['id'] as $key => $value) { @@ -640,7 +701,7 @@ LIMIT 1", $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) { $data = array( @@ -659,19 +720,19 @@ LIMIT 1", } } else { // No mail types defined - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}'); + displayMessage('{--MEMBER_ORDER_NO_PAYMENTS--}'); } } else { // No points left - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}'); + displayMessage('{--MEMBER_ORDER_NO_POINTS--}'); } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATEGORIES--}'); + displayMessage('{--MEMBER_NO_CATEGORIES--}'); } } else { // Please confirm some mails first - loadTemplate('admin_settings_saved', false, '{%message,MEMBER_LINKS_LEFT=' . $links . '%}', $links); + displayMessage('{%message,MEMBER_ORDER_LINKS_LEFT=' . getTotalUnconfirmedMails(getMemberId()) . '%}'); } if (!empty($url)) {