Introduced new extension ext-blacklist:

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

diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php
index d3ef5f112d0f00225b1f6370a0c0037dc7f537f2..d3c6a81e7ff48b75757c507c513d02c5d2555a22 100644 (file)
--- a/inc/filter/bonus_filter.php
+++ b/inc/filter/bonus_filter.php
@@ -51,7 +51,7 @@ function FILTER_ADD_LOGIN_BONUS ($filterData) {
 
        // Bonus is not given by default ;-)
        $bonus = FALSE;
-       if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (getIncludeBonusLogin() == '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
@@ -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 (getIncludeBonusClick() == 'Y') $add .= ' + `turbo_bonus`';
-       if (getIncludeBonusLogin() == 'Y') $add .= ' + `login_bonus`';
-       if (getIncludeBonusOrder() == 'Y') $add .= ' + `bonus_order`';
-       if (getIncludeBonusRef()   == 'Y') $add .= ' + `bonus_ref`';
-       if (getIncludeBonusStats() == 'Y') $add .= ' + `bonus_stats`';
+       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]
 ?>