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 4e6e52f4c43a57b553bd5ae67e7e38f839c3e85b..1d36cd12a4ef0a28ea38fe35c27e3369fb50b7f8 100644 (file)
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -41,31 +40,30 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 //
 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 = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
+               if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
                eval($eval);
-       }
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 
        // Also fill other constants
-       define('MUST_SEX'   , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-       define('MUST_ADDY'  , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-       define('MUST_BIRTH' , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
-       define('MUST_MARKER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
+       define('MUST_GENDER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
+       define('MUST_ADDY'  , "<div class=\"guest_failed\">&nbsp;(*)</div>");
+       define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
+       define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
 }
 //
 function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 {
        $ret = false;
-       foreach ($array as $key=>$value)
+       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
@@ -76,7 +74,7 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
                        // if extensions is present check if country code was selected
                        //         01              2         21    12             3         32    234     5      54    4               43    34                      4    4      5      5432    2      3                      3210
                        $country = ((!EXT_IS_ACTIVE("country")) || ((EXT_IS_ACTIVE("country")) && (((empty($value)) && ($key == "cntry")) || (($key == "country_code") && (!empty($value)))) && (!empty($array['country_code']))));
-                       if ((empty($value)) && ($chk == 'Y') && (!$country))
+                       if ((empty($value)) && ($chk == "Y") && (!$country))
                        {
                                // Required field not set
                                $array[$key] = "!";
@@ -89,16 +87,14 @@ 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'))
-               {
+               if (($array[$name] == "!") && ($required == "Y")) {
                        // Empty entry found
                        $array[$name] = "";
-                       $eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
-                       eval($eval);
-                       OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><br /><br />");
+                       $OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
+                       OUTPUT_HTML("<div class=\"register_failed\">".$OUT."</div>");
                }
        }
 
@@ -106,24 +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))
-               {
+               $OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
+               while (list($id, $cat, $visible) = SQL_FETCHROW($result)) {
                        if (empty($_POST['cat'][$id])) $_POST['cat'][$id] = "";
                        // Prepare array for the template
                        $content = array(
@@ -134,37 +127,29 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
                                'id'    => $id,
                        );
 
-                       if (($_POST['cat'][$id] == 'Y') || (($_CONFIG['register_default'] == 'Y') && (empty($_POST['cat'][$id]))))
-                       {
-                               $content['def_y'] = " checked";
-                       }
-                        else
-                       {
-                               $content['def_n'] = " checked";
+                       if (($_POST['cat'][$id] == "Y") || ((getConfig('register_default') == "Y") && (empty($_POST['cat'][$id])))) {
+                               $content['def_y'] = " checked=\"checked\"";
+                       } else {
+                               $content['def_n'] = " checked=\"checked\"";
                        }
 
                        // Load template and switch color
                        $OUT .= LOAD_TEMPLATE("guest_cat_row", true, $content);
                        $SW = 3 - $SW;
                }
-               $OUT .= "</TABLE>\n";
+               $OUT .= "</table>\n";
 
                // 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);
        }