More queries now depends on UNIX_TIMESTAMP() SQL function, wrong index in autopurge...

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

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 9ec6e996f07e36e11e519371153aaca6e6f95c80..863f1f602016a5e7ca45e1ff7eeec80927d72899 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -33,22 +33,19 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-if (!empty($_GET['u_id']))
-{
+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",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1)
-       {
+       if (SQL_NUMROWS($result) == 1) {
                // Loads surname, family's name and the email address
                list($sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -62,12 +59,10 @@ if (!empty($_GET['u_id']))
                // Ok, list categories of this user
                $result_cats = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats ORDER BY sort", __FILE__, __LINE__);
 
-               if (SQL_NUMROWS($result_cats) > 0)
-               {
+               if (SQL_NUMROWS($result_cats) > 0) {
                        // List categories
                        $cnt = "1"; $SW = 2; $OUT = "";
-                       while (list($cid, $cat) = SQL_FETCHROW($result_cats))
-                       {
+                       while (list($cid, $cat) = SQL_FETCHROW($result_cats)) {
                                // Check user's selection
                                $result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s AND cat_id=%s LIMIT 1",
                                 array(bigintval($_GET['u_id']), bigintval($cid)), __FILE__, __LINE__);
@@ -95,24 +90,18 @@ if (!empty($_GET['u_id']))
 
                        // Load main template
                        LOAD_TEMPLATE("admin_list_cats");
-               }
-                else
-               {
+               } else {
                        // No categories selected! :-(
                        LOAD_TEMPLATE("admin_list_cats_404");
                }
-       }
-        else
-       {
+       } else {
                // User not found
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.__UID.ADMIN_MEMBER_404_2);
        }
-}
- else
-{
+} else {
        // Output selection form with all confirmed user accounts listed
        ADD_MEMBER_SELECTION_BOX();
 }
-CLOSE_TABLE();
+
 //
 ?>