Another column fix

[mailer.git] / inc / modules / member / what-unconfirmed.php

diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index bf2112476b5dc67564b0df00209422ef7800ecb2..f6879b2ba8be1df6800fb08728e45f032b60e495 100644 (file)
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -32,37 +32,32 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-       LOAD_URL(URL."/modules.php?module=index");
+} elseif (!IS_MEMBER()) {
+       LOAD_URL("modules.php?module=index");
+} elseif (!EXT_IS_ACTIVE("mailid")) {
+       LOAD_URL("modules.php?module=login");
 }
 
 // Add description as navigation point
 ADD_DESCR("member", basename(__FILE__));
 
-OPEN_TABLE("100%", "member_content member_content_align", "");
-if (EXT_IS_ACTIVE("bonus"))
-{
+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=%d ORDER BY bonus_id DESC",
+       $result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s ORDER BY bonus_id DESC",
         array($GLOBALS['userid']), __FILE__, __LINE__);
-}
- else
-{
+} else {
        // Don't load bonus ID
-       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%d ORDER BY stats_id DESC",
+       $result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s ORDER BY stats_id DESC",
         array($GLOBALS['userid']), __FILE__, __LINE__);
 }
 
 if (SQL_NUMROWS($result) > 0)
 {
        // Please confirm these mails!
-       $sum = "0"; $SW = 2; $OUT = "";
+       $sum = 0; $SW = 2; $OUT = "";
        while (list($id, $id2, $type) = SQL_FETCHROW($result))
        {
                // Load data from stats table...
@@ -70,15 +65,15 @@ if (SQL_NUMROWS($result) > 0)
                switch ($type)
                {
                case "NORMAL":
-                       $result_data = SQL_QUERY_ESC("SELECT subject, subject, timestamp_ordered, cat_id, payment_id, pool_id FROM "._MYSQL_PREFIX."_user_stats WHERE id=%d LIMIT 1",
+                       $result_data = SQL_QUERY_ESC("SELECT subject, subject, timestamp_ordered, cat_id, payment_id, pool_id FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
                         array(bigintval($id)), __FILE__, __LINE__);
-                       $TYPE = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
+                       $type = "mailid"; $DATA = $id; $PROBLEM = NORMAL_MAIL_PROBLEM;
                        break;
 
                case "BONUS":
-                       $result_data = SQL_QUERY_ESC("SELECT subject, text, timestamp, cat_id, points, id FROM "._MYSQL_PREFIX."_bonus WHERE id=%d LIMIT 1",
+                       $result_data = SQL_QUERY_ESC("SELECT subject, text, timestamp, cat_id, points, id FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
                         array(bigintval($id2)), __FILE__, __LINE__);
-                       $TYPE = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
+                       $type = "bonusid"; $DATA = $id2; $PROBLEM = BONUS_MAIL_PROBLEM;
                        break;
                }
 
@@ -90,7 +85,7 @@ if (SQL_NUMROWS($result) > 0)
                        if ($type == "NORMAL")
                        {
                                $pay = GET_PAY_POINTS($pay, "payment");
-                               $result_text = SQL_QUERY_ESC("SELECT text FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
+                               $result_text = SQL_QUERY_ESC("SELECT text FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
                                 array(bigintval($pool)), __FILE__, __LINE__);
                                list($text) = SQL_FETCHROW($result_text);
                                SQL_FREERESULT($result_text);
@@ -104,7 +99,7 @@ if (SQL_NUMROWS($result) > 0)
                                'sw'     => $SW,
                                'uid'    => $GLOBALS['userid'],
                                'data'   => $DATA,
-                               'type'   => $TYPE,
+                               'type'   => $type,
                                'subj'   => $subject,
                                'text'   => COMPILE_CODE($text),
                                'stamp'  => MAKE_DATETIME($timestamp, "0"),
@@ -148,6 +143,6 @@ if (SQL_NUMROWS($result) > 0)
        // No mails left to confirm... :)
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_NO_MAILS_TO_CONFIRM);
 }
-CLOSE_TABLE();
+
 //
 ?>