Some functions rewritten to hungarian notation, handling of array rewritten

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

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 8873da7c1f13209496562254ba43e82ff39cb5a7..796eb90adfe55d29cadcf5fec4c087120576d203 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -32,18 +32,15 @@
  ************************************************************************/
 
 // 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_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[13~?module=index");
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 $UID = $GLOBALS['userid'];
 $whereStatement = " WHERE visible='Y'";
@@ -62,7 +59,7 @@ if ($cats > 0)
                {
                        if ($joined == "N") $cnt++;
                }
-               if (($cats - $cnt) < $_CONFIG['least_cats'])
+               if (($cats - $cnt) < getConfig('least_cats'))
                {
                        unset($_POST['ok']);
                        $LEAST = true;
@@ -74,14 +71,14 @@ if ($cats > 0)
                {
                        switch ($joined)
                        {
-                               case 'Y':
+                               case "Y":
                                        $sql = "";
                                        $result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s AND cat_id=%s LIMIT 1",
                                         array($UID, bigintval($cat)), __FILE__, __LINE__);
 
                                        if (SQL_NUMROWS($result_user) == 0)
                                        {
-                                               $sql = "INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES ('%s', '%s')";
+                                               $sql = "INSERT INTO "._MYSQL_PREFIX."_user_cats (userid, cat_id) VALUES ('%s','%s')";
                                        }
                                         else
                                        {
@@ -90,7 +87,7 @@ if ($cats > 0)
                                        }
                                        break;
 
-                               case 'N':
+                               case "N":
                                        $sql = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s AND cat_id=%s LIMIT 1";
                                        break;
                        }
@@ -108,7 +105,7 @@ if ($cats > 0)
                if ($LEAST)
                {
                        // Also here we have to secure it... :(
-                       LOAD_TEMPLATE("admin_settings_saved", true, CATS_LEAST.": ".$_CONFIG['least_cats']);
+                       LOAD_TEMPLATE("admin_settings_saved", true, CATS_LEAST.": ".getConfig('least_cats'));
                }
                // Put some data into constants for the template
                define('__ROWS', ($cats*2+4));
@@ -121,7 +118,7 @@ if ($cats > 0)
                while (list($id, $cat) = SQL_FETCHROW($result))
                {
                        // Default he has not joined
-                       $JOINED_N = ' checked'; $JOINED_Y = "";
+                       $JOINED_N = " checked=\"checked\""; $JOINED_Y = "";
 
                        // Check category selection
                        $result_user = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_cats WHERE userid=%s AND cat_id=%s LIMIT 1",
@@ -130,13 +127,13 @@ if ($cats > 0)
                        // When we found an entry don't read it, just change the JOINED_x variables
                        if (isset($_POST['cat']))
                        {
-                               if ($_POST['cat'][$id] =='Y') { $JOINED_Y = ' checked'; $JOINED_N = ""; }
+                               if ($_POST['cat'][$id] =='Y') { $JOINED_Y = " checked=\"checked\""; $JOINED_N = ""; }
                        }
                         else
                        {
                                if (SQL_NUMROWS($result_user) == 1)
                                {
-                                       $JOINED_Y = ' checked'; $JOINED_N = "";
+                                       $JOINED_Y = " checked=\"checked\""; $JOINED_N = "";
                                }
 
                                // Free memory