Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index af0d7d96fb6fe80cfd2ff4670d6e621a506fc332..8619711604e6cafba1ebd79332a98b1ccc4ff1a8 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -46,8 +46,7 @@ if (getConfig('beg_rallye') == "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_BEG_WITHDRAW_PREPARED);
-               OUTPUT_HTML("<br />");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
        } // END - if
 
        // Autopurge installed?
@@ -60,7 +59,7 @@ if (getConfig('beg_rallye') == "Y") {
 
        // Check if at least one is in the active rallye
        $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE status='CONFIRMED' AND beg_points > 0".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
@@ -68,7 +67,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+               while (list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
                        // Init variables
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= getConfig('beg_ranks')) {
@@ -105,7 +104,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
                } else {
                        // Display message "no manual withdraw possible"
-                       define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">".ADMIN_BEG_ALREADY_WITHDRAW."</div>");
+                       define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{!ADMIN_BEG_ALREADY_WITHDRAW!}</div>");
                }
 
                // Prepare constant for timemark
@@ -119,11 +118,11 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                LOAD_TEMPLATE("admin_list_beg");
        } else {
                // No one has joined the begging rallye...
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_NO_RALLYE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_NO_RALLYE'));
        }
 } else {
        // Rallye deactivated
-       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BEG_RALLYE_DEACTIVATED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
 }
 
 //