mailer project continued:

[mailer.git] / inc / modules / admin / what-send_coupon.php

diff --git a/inc/modules/admin/what-send_coupon.php b/inc/modules/admin/what-send_coupon.php
index 2d359b36618272f7ed3b5c0cf2de7c33720a4c47..9cfb2f5607b754d7bd33a9d1abf5e9c6acaa2e20 100644 (file)
--- a/inc/modules/admin/what-send_coupon.php
+++ b/inc/modules/admin/what-send_coupon.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,29 +46,38 @@ addYouAreHereLink('admin', __FILE__);
 // Is the form sent?
 if (isFormSent()) {
        // Are all required fields set?
-       if (!isPostRequestParameterSet('points')) {
+       if (!isPostRequestElementSet('points')) {
                // Points not entered
                displayMessage('{--ADMIN_SEND_COUPON_POINTS_NOT_ENTERED--}');
-       } elseif (!isPostRequestParameterSet('coupon_description')) {
+       } elseif (!isPostRequestElementSet('coupon_description')) {
                // Description not entered
                displayMessage('{--ADMIN_SEND_COUPON_DESCRIPTION_NOT_ENTERED--}');
        } else {
                // All fields are set, so we can start looking for users who wants to receive coupons
-               $result = SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `receiving_coupons`='Y' ORDER BY `userid` ASC",
+               $result = SQL_QUERY("SELECT
+       `userid`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `status`='CONFIRMED' AND
+       `receiving_coupons`='Y'
+       " . runFilterChain('user_exclusion_sql', ' ') . "
+ORDER BY
+       `userid` ASC",
                        __FILE__, __LINE__);
 
                // Do we have entries left?
-               if (SQL_NUMROWS($result) > 0) {
+               if (!SQL_HASZERONUMS($result)) {
                        // Convert timestamp selections
                        $expirationTime = time() + createEpocheTimeFromSelections('coupon_default_time', postRequestArray());
 
                        // Insert coupon data
-                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_coupon_data` (`coupon_expired`, `total_created`, `points`, `coupon_description`) VALUES ('{%%pipe,SQL_EPOCHE_TO_TIMESTAMP=%s%%}', %s,%s,'%s')",
+                       SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_coupon_data` (`coupon_expired`,`total_created`,`points`,`coupon_description`) VALUES ('{%%pipe,SQL_EPOCHE_TO_TIMESTAMP=%s%%}', %s,%s,'%s')",
                                array(
                                        $expirationTime,
                                        SQL_NUMROWS($result),
-                                       bigintval(postRequestParameter('points')),
-                                       postRequestParameter('coupon_description')
+                                       bigintval(postRequestElement('points')),
+                                       postRequestElement('coupon_description')
                                ), __FILE__, __LINE__
                        );
 
@@ -83,26 +92,30 @@ if (isFormSent()) {
 
                                // Look for a unique id
                                while (!$isUnique) {
-                                       /**
+                                       /*
                                         * Add a coupon for this user, first we need to create a
                                         * table-unique "id". The function generatePassword() can do
                                         * this job for us but we want to exclude some characters.
                                         */
-                                       $couponCode = generatePassword(30, array('-','+','_','/','.'));
+                                       $couponCode = generatePassword(30, array('-', '+', '_', '/', '.'));
 
                                        // Is it really unique?
                                        $isUnique = (countSumTotalData($couponCode, 'user_coupons', 'id', 'coupon_code', true) == 0);
                                } // END - while
 
                                // The above loop should always set $couponCode, so we can now insert it
-                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_coupons` (`coupon_id`, `userid`, `coupon_code`) VALUES (%s,%s,'%s')",
-                                       array($couponId, $userid, $couponCode), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_coupons` (`coupon_id`,`userid`,`coupon_code`) VALUES (%s,%s,'%s')",
+                                       array(
+                                               $couponId,
+                                               $userid,
+                                               $couponCode
+                                       ), __FILE__, __LINE__);
 
                                // Fill array with all required data
                                $content = array(
                                        'coupon_id'      => $couponId,
                                        'userid'         => $userid,
-                                       'points'         => bigintval(postRequestParameter('points')),
+                                       'points'         => bigintval(postRequestElement('points')),
                                        'coupon_code'    => $couponCode,
                                        'coupon_expired' => generateDateTime($expirationTime, '0')
                                );
@@ -114,7 +127,7 @@ if (isFormSent()) {
                                sendEmail($userid, '{--MEMBER_COUPON_SUBJECT--}', $mailText);
 
                                // Rember this user for the admin email
-                               $adminUserids[] = $userid;
+                               array_push($adminUserids, $userid);
                        } // END - while
 
                        // Prepare content for template
@@ -122,8 +135,8 @@ if (isFormSent()) {
                                'userids'            => implode(',', $adminUserids),
                                'userid_count'       => count($adminUserids),
                                'coupon_id'          => $couponId,
-                               'points'             => bigintval(postRequestParameter('points')),
-                               'coupon_description' => postRequestParameter('coupon_description'),
+                               'points'             => bigintval(postRequestElement('points')),
+                               'coupon_description' => postRequestElement('coupon_description'),
                                'coupon_expired'     => generateDateTime($expirationTime, '0')
                        );