X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-order.php;h=c9bfafc8b1a5d2b84a7716cb103e554e2ccad803;hb=0f0e365a0e710b750d74ef8587dde8b37881dbeb;hp=a950b0993d6cc2efe11e1f082a8f6dab1d99960d;hpb=9dfe6c0b9fb1515fac0183515a2c77236ba93778;p=mailer.git diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index a950b0993d..c9bfafc8b1 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -64,13 +64,16 @@ $links = countSumTotalData(getMemberId(), 'user_links', 'id', 'userid', true); // Do we have ext-holiday installed? // @TODO Rewrite this to a filter $extraColumn = 'userid'; -if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) { +if (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Fetch also holiday activation data $extraColumn = 'holiday_active'; } // END - if $result_mmails = SQL_QUERY_ESC("SELECT - `userid`, `receive_mails`, `mail_orders`, `".$extraColumn."` + `userid`, + `receive_mails`, + `mail_orders`, + `".$extraColumn."` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -94,7 +97,7 @@ 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')); } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) { @@ -198,7 +201,13 @@ LIMIT 1", // 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; @@ -223,7 +232,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( @@ -238,7 +251,7 @@ ORDER BY // Load receivers from database $TEST = array(); $cnt = '0'; while ($holidayContent = SQL_FETCHARRAY($result)) { - if (getExtensionVersion('holiday') >= '0.1.3') { + if (isExtensionInstalledAndNewer('holiday', '0.1.3')) { // Check for his holiday status $result_holiday = SQL_QUERY_ESC("SELECT `id` @@ -278,7 +291,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); @@ -292,33 +305,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 { @@ -345,7 +358,7 @@ LIMIT 1", postRequestParameter('subject'), postRequestParameter('text'), $receiver, - bigintval(postRequestParameter('type')), + bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), $content['target_send'], @@ -374,7 +387,7 @@ LIMIT 1", postRequestParameter('subject'), postRequestParameter('text'), $receiver, - bigintval(postRequestParameter('type')), + bigintval(postRequestParameter('mail_type')), postRequestParameter('url'), bigintval(postRequestParameter('cat')), $content['target_send'], @@ -391,7 +404,7 @@ LIMIT 1", array( getMemberId(), postRequestParameter('subject'), - bigintval(postRequestParameter('type')) + bigintval(postRequestParameter('mail_type')) ), __FILE__, __LINE__); // Get pool id @@ -443,7 +456,7 @@ ORDER BY // @TODO Rewrite this to a filter $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 $HOL_STRING = " AND `holiday_active`='N'"; } // END - if @@ -461,7 +474,7 @@ ORDER BY while (list($ucat) = SQL_FETCHROW($result_userids)) { // Check for holiday system $HOL_ACTIVE = false; - if (getExtensionVersion('holiday') >= '0.1.3') { + 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