Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 8f9831e34dfd8abf96fd981b1b7f237e48c941d5..e082040a1374417d2b72d5b11bdf304e647e362e 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -47,7 +47,7 @@ if (empty($_GET['del'])) $_GET['del'] = "";
 
 if (!empty($_GET['u_id'])) {
        // Check if the user already exists
-       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
         // Is there an entry?
@@ -59,11 +59,11 @@ if (!empty($_GET['u_id'])) {
                // Grab user's all unconfirmed mails
                if (EXT_IS_ACTIVE("bonus")) {
                        // Load bonus ID
-                       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",
                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                } else {
                        // Load stats ID (2nd will be ignored later! But it is needed for the same fetchrow command)
-                       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY id",
+                       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",
                         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                }
 
@@ -74,15 +74,15 @@ if (!empty($_GET['u_id'])) {
                        // Some unconfirmed mails left
                        if ($_GET['del'] == "all") {
                                // Delete all unconfirmed mails by this user
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
                                        array(bigintval($_GET['u_id']), $nums), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
                                $msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval($_GET['u_id']));
-                               SEND_EMAIL($email, ADMIN_DEL_LINK_SUBJ, $msg);
+                               SEND_EMAIL($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
 
                                // Display message
-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LINKS_DELETED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_LINKS_DELETED'));
                        } else {
                                // List all unconfirmed mails
                                $SW = 2; $OUT = "";
@@ -97,17 +97,17 @@ if (!empty($_GET['u_id'])) {
                                        switch ($type)
                                        {
                                        case "NORMAL":
-                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM `{!MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
+                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE id=%s LIMIT 1",
                                                        array(bigintval($id)), __FILE__, __LINE__);
                                                $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
-                                               $LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
+                                               $LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
                                                break;
 
                                        case "BONUS":
-                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM `{!MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
+                                               $result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",
                                                        array(bigintval($id2)), __FILE__, __LINE__);
                                                $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
-                                               $LINK = "<a href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+                                               $LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
                                                break;
 
                                        default: // Problem in application detected!
@@ -120,7 +120,7 @@ if (!empty($_GET['u_id'])) {
                                                // Mail was found!
                                                list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
                                                SQL_FREERESULT($result_data);
-                                               if (empty($subject)) $subject = DEFAULT_SUBJECT_LINE;
+                                               if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
 
                                                // Prepare data for the row template
                                                $content = array(