Functions imported, some dev-scripts added

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index c99cb1b254315523ae4ea8efabde335152a0f5fe..f7719b9a3227789d97ef047cbe85d673d15414c5 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -47,8 +47,7 @@ if (getConfig('bonus_active') == "Y") {
                $curr = date("m", time()) - 1;
                if (strlen($curr) == 1) $curr = "0".$curr;
                UPDATE_CONFIG("last_month", $curr);
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
-               OUTPUT_HTML("<br />");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
        }
 
        if (GET_EXT_VERSION("bonus") >= "0.6.9") {
@@ -75,8 +74,8 @@ if (getConfig('bonus_active') == "Y") {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
-FROM `{!MYSQL_PREFIX!}_user_data`
-WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 
@@ -119,25 +118,25 @@ ORDER BY points DESC, last_online DESC, userid",
                        define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
                } else {
                        // Display message "no manual withdraw possible"
-                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BONUS_ALREADY_WITHDRAW."</div>");
+                       define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>");
                }
 
                // Prepare constant for timemark
                if (EXT_IS_ACTIVE("autopurge")) {
                        define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
                } else {
-                       define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+                       define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "autopurge"));
                }
 
                // Load final template
                LOAD_TEMPLATE("admin_list_bonus");
        } else {
                // No one has become an "activity bonus"...
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_NO_ACTIVE_RALLYE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));
        }
 } else {
        // Aktive-Rallye not activated
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_RALLYE_DEACTIVATED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
 }
 
 //