X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=77b8206c67f4883ad06e8137130a8147f5afc9bc;hp=a51cf0f7eaa59627b1f853d38a40fc255bdd7aa6;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6 diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index a51cf0f7ea..77b8206c67 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -18,6 +18,7 @@ * 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 * @@ -51,7 +52,7 @@ if ((!isExtensionActive('order')) && (!isAdmin())) { return; } // END - if -$URL = ''; $id = '0'; +$url = ''; $id = '0'; $whereStatement = " WHERE `visible`='Y'"; // Set undefined array elements @@ -62,14 +63,17 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true); // Do we have ext-holiday installed? // @TODO Rewrite this to a filter -$HOLIDAY = 'userid'; -if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) { +$extraColumn = 'userid'; +if (isExtensionInstalledAndNewer('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 @@ -93,9 +97,9 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI; // Now check his points amount $total = countSumTotalData(getMemberId(), 'user_points', 'points') - countSumTotalData(getMemberId(), 'user_data', 'used_points');; -if (($HOLIDAY == 'Y') && (getExtensionVersion('holiday') >= '0.1.3')) { +if (($HOLIDAY == 'Y') && (isExtensionInstalledAndNewer('holiday', '0.1.3'))) { // Holiday is active! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_ORDER_NOT_POSSIBLE')); + loadTemplate('admin_settings_saved', false, '{--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 // @@ -106,12 +110,11 @@ FROM WHERE `sender`=%s AND `url`='%s' AND - `timestamp` > (UNIX_TIMESTAMP() - %s) + `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?}) LIMIT 1", array( getMemberId(), - postRequestParameter('url'), - getConfig('url_tlock') + postRequestParameter('url') ), __FILE__, __LINE__); $type = 'TEMP'; $id = '0'; @@ -126,12 +129,12 @@ 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 = ''; + $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! - $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 @@ -140,7 +143,7 @@ LIMIT 1", // 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 @@ -150,7 +153,7 @@ LIMIT 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('SUBJ_URL'); } // END - if } // END - if @@ -165,7 +168,7 @@ LIMIT 1", 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 @@ -175,13 +178,13 @@ LIMIT 1", // Enougth receivers entered? 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(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 @@ -192,24 +195,32 @@ LIMIT 1", setPostRequestParameter('text', checkHtmlTags(postRequestParameter('text'))); // Maybe invalid tags found? - if (!isPostRequestParameterSet('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 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') && (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}'"; + $add = sprintf(" AND d.zip LIKE '%s%%'", + bigintval(postRequestParameter('zip')) + ); } // END - if // Check for userids @@ -222,7 +233,11 @@ 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( @@ -234,17 +249,10 @@ ORDER BY // 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 (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Check for his holiday status $result_holiday = SQL_QUERY_ESC("SELECT `id` @@ -284,7 +292,7 @@ LIMIT 1", 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); @@ -298,33 +306,33 @@ LIMIT 1", 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 { @@ -351,7 +359,7 @@ LIMIT 1", postRequestParameter('subject'), postRequestParameter('text'), $receiver, - bigintval(postRequestParameter('type')), + bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), $content['target_send'], @@ -380,7 +388,7 @@ LIMIT 1", postRequestParameter('subject'), postRequestParameter('text'), $receiver, - bigintval(postRequestParameter('type')), + bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), $content['target_send'], @@ -397,7 +405,7 @@ LIMIT 1", array( getMemberId(), postRequestParameter('subject'), - bigintval(postRequestParameter('type')) + bigintval(postRequestParameter('mail_type')) ), __FILE__, __LINE__); // Get pool id @@ -408,25 +416,25 @@ LIMIT 1", } // 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; + $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 (postRequestParameter('receiver') == '0') { // Not enougth receivers selected - $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1'); + $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')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}'); } elseif (($links < getConfig('unconfirmed')) && ($mmails == 1)) { // Display order form $result_cats = SQL_QUERY("SELECT @@ -447,11 +455,11 @@ ORDER BY // 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 @@ -467,7 +475,7 @@ ORDER BY while (list($ucat) = SQL_FETCHROW($result_userids)) { // Check for holiday system $HOL_ACTIVE = false; - if ($HOLIDAY) { + 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 @@ -626,12 +634,13 @@ LIMIT 1", } // END - if } // END - foreach + // No content is default + $content['zip_content'] = ''; + if (isPostRequestParameterSet('zip')) { // Output entered ZIP code - $content['zip_content'] = loadTemplate('member_order-zip', true, postRequestParameter('zip')); - } else { - $content['zip_content'] = " "; - } + $content['zip_content'] = loadTemplate('member_order-zip2', true, postRequestParameter('zip')); + } // END - if // HTML extension if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) { @@ -639,21 +648,19 @@ LIMIT 1", $content['html_extension'] = loadTemplate('member_order-html_ext', true, addValidHtmlTags()); } else { // Extension not active and/or class not uploaded - $content['html_extension'] = ""; + $content['html_extension'] = ''; } // Output form for page 2 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 = " \n"; $content['html_extension'] = loadTemplate('member_order-html_intro', true); } else { // No HTML extension installed - $content['html_extension'] = ""; + $content['html_extension'] = ''; } // Default is no ZIP code @@ -664,13 +671,11 @@ LIMIT 1", // 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); @@ -681,27 +686,27 @@ LIMIT 1", } } else { // No mail types defined - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_PAYMENTS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_PAYMENTS--}'); } } else { // No points left - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_POINTS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_POINTS--}'); } } else { // No cateogries are defined yet - loadTemplate('admin_settings_saved', false, "{--MEMBER_NO_CATS--}"); + loadTemplate('admin_settings_saved', false, '{--MEMBER_NO_CATS--}'); } } elseif ($mmails == '0') { // Please set more than 0 mails per day - loadTemplate('admin_settings_saved', false, getMessage('MEMBER_HAS_ZERO_MMAILS')); + loadTemplate('admin_settings_saved', false, '{--MEMBER_HAS_ZERO_MMAILS--}'); } else { // Please confirm some mails first loadTemplate('admin_settings_saved', false, getMaskedMessage('MEMBER_LINKS_LEFT'), $links); } -if (!empty($URL)) { +if (!empty($url)) { // Redirect to requested URL - redirectToUrl($URL); + redirectToUrl($url); } // END - if // [EOF]