Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / filter / bonus_filter.php

diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php
index b0bfa46ec484255934af3dc993e2f5bd83317c68..65160b756feb484a197a75fbde067fa5ad8dbc89 100644 (file)
--- a/inc/filter/bonus_filter.php
+++ b/inc/filter/bonus_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,15 +46,15 @@ function FILTER_ADD_LOGIN_BONUS ($filterData) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isMember()) {
                // Do only run for logged in members
-               debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
+               reportBug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
        } // END - if
 
        // Bonus is not given by default ;-)
-       $bonus = false;
-       if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('include_bonus_login') == 'Y')) {
+       $bonus = FALSE;
+       if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (isIncludeBonusLoginEnabled())) {
                // Update last login if far enougth away
                // @TODO This query isn't right, it will only update if the user was for a longer time away!
-               SQL_QUERY_ESC('UPDATE
+               sqlQueryEscaped('UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `last_login`=UNIX_TIMESTAMP()
@@ -68,10 +68,10 @@ LIMIT 1',
                );
 
                // Updated entry?
-               $bonus = (!SQL_HASZEROAFFECTED());
+               $bonus = (!ifSqlHasZeroAffectedRows());
        } // END - if
 
-       if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
+       if (($bonus === TRUE) && (getRequestElement('do') == 'bonus')) {
                // Output message with added points
                $GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
        } else {
@@ -86,11 +86,12 @@ LIMIT 1',
 
 // Filter for generating admin mail links for bonus mails
 function FILTER_GENERATE_BONUS_MAIL_LINKS ($filterData) {
-       // Is the type 'bid'?
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ($filterData['type'] == 'bid') {
+
+       // Is the type 'bonus'?
+       if ($filterData['type'] == 'bonus') {
                // Load template
-               $filterData['__output'] .= loadTemplate('admin_links_bonus_mail', true, $filterData);
+               $filterData['__output'] .= loadTemplate('admin_links_bonus_mail', TRUE, $filterData);
        } // END - if
 
        // Return data
@@ -100,6 +101,8 @@ function FILTER_GENERATE_BONUS_MAIL_LINKS ($filterData) {
 
 // Filter for adding bonus columns with a plus (+) sign
 function FILTER_ADD_BONUS_POINTS_USER_COLUMNS ($add = '') {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
        // Skip out-dated extension, because this causes an error
        if (isExtensionInstalledAndOlder('bonus', '0.9.7')) {
                // Skip this silently
@@ -107,15 +110,59 @@ function FILTER_ADD_BONUS_POINTS_USER_COLUMNS ($add = '') {
        } // END - if
 
        // Add more columns only when the corresponding configuration is enabled, too
-       if (getConfig('include_bonus_click') == 'Y') $add .= ' + `turbo_bonus`';
-       if (getConfig('include_bonus_login') == 'Y') $add .= ' + `login_bonus`';
-       if (getConfig('include_bonus_order') == 'Y') $add .= ' + `bonus_order`';
-       if (getConfig('include_bonus_stats') == 'Y') $add .= ' + `bonus_stats`';
-       if (getConfig('include_bonus_ref')   == 'Y') $add .= ' + `bonus_ref`';
+       if (isIncludeBonusClickEnabled()) $add .= ' + `turbo_bonus`';
+       if (isIncludeBonusLoginEnabled()) $add .= ' + `login_bonus`';
+       if (isIncludeBonusOrderEnabled()) $add .= ' + `bonus_order`';
+       if (isIncludeBonusRefEnabled()  ) $add .= ' + `bonus_ref`';
+       if (isIncludeBonusStatsEnabled()) $add .= ' + `bonus_stats`';
 
        // Return $add
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
        return $add;
 }
 
+// Filter for adding SQL columns on user registration for bonus/"active" rallye notification
+function FILTER_BONUS_USER_REGISTRATION_ADD_SQL_COLUMNS ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+
+       // Next: active rallye
+       if (!isBonusNewMemberNotifyEnabled()) {
+               addExtraRegistrationColumns(', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`');
+               $GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
+       } // END - if
+
+       // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';
+       return $filterData;
+}
+
+// Filter for sending out bonus rallye notifications
+function FILTER_SEND_BONUS_NOTIFICATIONS ($filterData) {
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
+       // Check for bonus rallye is active and send mails out
+       if ((isBonusRallyeActive()) && (isBonusNewMemberNotifyEnabled())) {
+               // Include file for sending out mails
+               addIncludeToPool('notify', 'inc/mails/bonus_mails.php');
+       } // END - if
+
+       // Return filter data
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
+       //* NOISY-DEBUG: */ print __FUNCTION__.':filterData=<pre>'.print_r($filterData,TRUE).'</pre>';
+       return $filterData;
+}
+
+// Filter to add exclusion SQL for configured userid
+function FILTER_EXLCUDE_BONUS_USERID ($filterData = array()) {
+       // Is it valid?
+       if (isValidId(getBonusUserid())) {
+               // Exclude it
+               array_push($filterData, '{?bonus_userid?}');
+       } // END - if
+
+       // Return it
+       return $filterData;
+}
+
 // [EOF]
 ?>