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 0403890eaec5f6756231430ca346a3a97efd3d33..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 - 2012 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 *
@@ -51,10 +51,10 @@ function FILTER_ADD_LOGIN_BONUS ($filterData) {
 
        // Bonus is not given by default ;-)
        $bonus = FALSE;
-       if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getConfig('include_bonus_login') == 'Y')) {
+       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,7 +68,7 @@ LIMIT 1',
                );
 
                // Updated entry?
-               $bonus = (!SQL_HASZEROAFFECTED());
+               $bonus = (!ifSqlHasZeroAffectedRows());
        } // END - if
 
        if (($bonus === TRUE) && (getRequestElement('do') == 'bonus')) {
@@ -88,8 +88,8 @@ LIMIT 1',
 function FILTER_GENERATE_BONUS_MAIL_LINKS ($filterData) {
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
 
-       // Is the type 'bid'?
-       if ($filterData['type'] == 'bid') {
+       // Is the type 'bonus'?
+       if ($filterData['type'] == 'bonus') {
                // Load template
                $filterData['__output'] .= loadTemplate('admin_links_bonus_mail', TRUE, $filterData);
        } // END - if
@@ -110,11 +110,11 @@ 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!');
@@ -152,5 +152,17 @@ function FILTER_SEND_BONUS_NOTIFICATIONS ($filterData) {
        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]
 ?>