Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 68399a678d5a7993e8abc610e92fa44f91a1be50..ca6a77dbd33eeb682b3f506013c01e5b74612b93 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -90,7 +90,7 @@ if (empty($_GET['sortby'])) { $_GET['sortby'] = "userid"; }
 if (empty($_GET['page']))   { $_GET['page']   = "1";      }
 
 // Set base URL
-$BASE = "[<a href=\"".URL."/modules.php?module=admin";
+$BASE = "[<a href=\"{!URL!}/modules.php?module=admin";
 
 if (!empty($_GET['u_id'])) {
        // Secure the user ID
@@ -98,7 +98,7 @@ if (!empty($_GET['u_id'])) {
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout, emails_received, mails_confirmed".$MORE."
-FROM `{!MYSQL_PREFIX!}_user_data`
+FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s
 LIMIT 1",
                array($uid), __FILE__, __LINE__);
@@ -196,7 +196,7 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = "";
-       if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET['letter']))) {
+       if (($_GET['letter'] != getMessage('_ALL2')) && ($_GET['letter'] != getMessage('_OTHERS')) && (!empty($_GET['letter']))) {
                // List only persons w
                $whereStatement = " WHERE family LIKE '".$_GET['letter']."%'";
        } // END - if
@@ -232,7 +232,7 @@ LIMIT 1",
        } // END = if
 
        // Prepare SQL and run it
-       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!_MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".SQL_ESCAPE($_GET['sortby']);
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
@@ -251,7 +251,7 @@ LIMIT 1",
        $SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
        $result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
-       $result_user = SQL_QUERY("SELECT emails_sent FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);
        $user_count = SQL_NUMROWS($result_user);
        SQL_FREERESULT($result_user);
 
@@ -355,7 +355,7 @@ LIMIT 1",
                SQL_FREERESULT($result_master);
        } else {
                // No one as registered so far! :-(
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_NONE_REGISTERED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_NONE_REGISTERED'));
        }
 }