Rewrites/fixes for handling config entries in SQLs

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 72b6b2e24d47c57dcca4ddbd237100a2b3bb4f55..5c99bb2e47dae5cfc4a58541cdc0a55591f6ecfd 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -108,7 +109,7 @@ function addTurboBonus ($mid, $userid, $type) {
                        $points
                ), __FUNCTION__, __LINE__);
 
-       if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD") && ($points > 0)) handleBonusPoints($points);
+       if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD') && ($points > 0)) handleBonusPoints($points);
 }
 
 //
@@ -187,9 +188,6 @@ LIMIT 1",
                                        // Is it not empty? Then use it
                                        if (!empty($nick)) $rows['userid'] = $nick;
                                } // END - if
-
-                               // Translate comma
-                               $rows['points'] = translateComma($rows['points']);
                        } // END - if
 
                        // Free result
@@ -201,9 +199,9 @@ LIMIT 1",
 
                        // Output row
                        $OUT .= "<tr>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\">&nbsp;".$rows['rank'].".</td>
+  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\">".$rows['rank'].".</td>
   <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['userid']."</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['points']."</td>
+  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">{%pipe,translateComma=".$rows['points']."%}</td>
 </tr>\n";
 
                        // Switch color
@@ -280,7 +278,7 @@ function purgeExpiredTurboBonus() {
 
        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS(), '');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
        } // END - if
 }
 
@@ -293,7 +291,7 @@ function FILTER_ADD_LOGIN_BONUS () {
        // Is the user data valid?
        if (!isMember()) {
                // Do only run for logged in members
-               debug_report_bug('Please only run this filter for logged in users.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
        } // END - if
 
        // Bonus is not given by default ;-)
@@ -311,16 +309,16 @@ WHERE
 LIMIT 1",
                        array(
                                getMemberId()
-                       ), __FILE__, __LINE__
+                       ), __FUNCTION__, __LINE__
                );
 
                // Updated entry?
                $bonus = (SQL_AFFECTEDROWS() == 1);
        } // END - if
 
-       if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
+       if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
                // Output message with added points
-               $GLOBALS['message'] .= '<div class="tiny">' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '</div>';
+               $GLOBALS['message'] .= '<div class="tiny">{--BONUS_LOGIN_BONUS_ADDED--}</div>';
        } elseif (isExtensionActive('bonus')) {
                // No login bonus added!
                $GLOBALS['message'] .= '<div class="member_failed">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';