Security line in all includes changed

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

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 4e6e52f4c43a57b553bd5ae67e7e38f839c3e85b..f3c140674acce8bdc86ef22c711f421277942230 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);
 }
@@ -45,7 +44,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
        while(list($name, $required) = SQL_FETCHROW($result))
        {
                $value = "";
-               if ($required == 'Y') $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
+               if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
                $eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
                eval($eval);
        }
@@ -54,7 +53,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
        SQL_FREERESULT($result);
 
        // Also fill other constants
-       define('MUST_SEX'   , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
+       define('MUST_GENDER', "<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>");
@@ -63,7 +62,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
 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__);
                if (SQL_NUMROWS($result) == 1)
@@ -76,7 +75,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] = "!";
@@ -92,7 +91,7 @@ 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))
        {
-               if (($array[$name] == "!") && ($required == 'Y'))
+               if (($array[$name] == "!") && ($required == "Y"))
                {
                        // Empty entry found
                        $array[$name] = "";
@@ -134,13 +133,13 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
                                'id'    => $id,
                        );
 
-                       if (($_POST['cat'][$id] == 'Y') || (($_CONFIG['register_default'] == 'Y') && (empty($_POST['cat'][$id]))))
+                       if (($_POST['cat'][$id] == "Y") || (($_CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id]))))
                        {
-                               $content['def_y'] = " checked";
+                               $content['def_y'] = ' checked';
                        }
                         else
                        {
-                               $content['def_n'] = " checked";
+                               $content['def_n'] = ' checked';
                        }
 
                        // Load template and switch color