More improvements:

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

diff --git a/inc/filter/bonus_filter.php b/inc/filter/bonus_filter.php
index d3ef5f112d0f00225b1f6370a0c0037dc7f537f2..c86dda30de64700144acc4e3f035fe8b98a89f8e 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
@@ -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!');