More references to removed (still some left)

[mailer.git] / inc / libs / register_functions.php

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 1c266eec813014a5d5cb8c4486455f7e466d9e63..1d36cd12a4ef0a28ea38fe35c27e3369fb50b7f8 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,8 +40,8 @@ if (!defined('__SECURITY')) {
 //
 function REGISTER_FILL_MUST_CONSTANTS()
 {
-       $result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
-       while(list($name, $required) = SQL_FETCHROW($result)) {
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);
+       while (list($name, $required) = SQL_FETCHROW($result)) {
                $value = "";
                if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
@@ -63,7 +63,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
        $ret = false;
        foreach ($array as $key => $value)
        {
-               $result = SQL_QUERY("SELECT field_required FROM "._MYSQL_PREFIX."_must_register WHERE field_name='".$key."' LIMIT 1", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1", __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // "Must-line" found
@@ -87,8 +87,8 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 //
 function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
 {
-       $result = SQL_QUERY("SELECT field_name, field_required FROM "._MYSQL_PREFIX."_must_register ORDER BY id", __FILE__, __LINE__);
-       while(list($name, $required) = SQL_FETCHROW($result))
+       $result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FILE__, __LINE__);
+       while (list($name, $required) = SQL_FETCHROW($result))
        {
                if (($array[$name] == "!") && ($required == "Y")) {
                        // Empty entry found
@@ -102,25 +102,21 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array)
        SQL_FREERESULT($result);
 }
 //
-function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
-{
-       global $_POST, $_CONFIG;
+function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) {
        $OUT = "";
 
        // Guests are mostly not interested in how many members has
        // choosen an individual category
-       $AND = "WHERE visible='Y' ";
+       $AND = "WHERE `visible`='Y' ";
 
        // Admins are allowed to see every category...
        if (IS_ADMIN()) $AND = "";
-       $result = SQL_QUERY("SELECT id, cat, visible FROM "._MYSQL_PREFIX."_cats ".$AND." ORDER BY sort", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0)
-       {
+       $result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`", __FILE__, __LINE__);
+       if (SQL_NUMROWS($result) > 0) {
                // List alle visible modules (or all to the admin)
                $SW = 2;
                $OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
-               while (list($id, $cat, $visible) = SQL_FETCHROW($result))
-               {
+               while (list($id, $cat, $visible) = SQL_FETCHROW($result)) {
                        if (empty($_POST['cat'][$id])) $_POST['cat'][$id] = "";
                        // Prepare array for the template
                        $content = array(
@@ -145,20 +141,15 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
 
                // Free memory
                SQL_FREERESULT($result);
-       }
-        else
-       {
+       } else {
                // No categories setted up so far...
-               $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, NO_CATEGORIES_VISIBLE);
+               $OUT .= LOAD_TEMPLATE("admin_settings_saved", true, getMessage('NO_CATEGORIES_VISIBLE'));
        }
 
-       if ($return)
-       {
+       if ($return) {
                // Return generated HTML code
                return $OUT;
-       }
-        else
-       {
+       } else {
                // Output directly (default)
                OUTPUT_HTML($OUT);
        }