X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=f90e1b8d3083313fe27b46d4878a18c6db1102bf;hb=3df5cfd765d32de200a4db2a21a04cb2fde40b23;hp=5837b848ebc0530d3b4f3be987e92c42fe285b2b;hpb=307a4e11763f0914e73dc756b219356e1c29ab25;p=mailer.git

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 5837b848eb..f90e1b8d30 100644
--- 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);
 }
@@ -42,19 +41,18 @@ 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))
-	{
+	while(list($name, $required) = SQL_FETCHROW($result)) {
 		$value = "";
 		if ($required == "Y") $value = "<FONT class=\\\"guest_failed\\\">&nbsp;(*)</FONT>";
 		$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_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 +61,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)
@@ -92,12 +90,10 @@ 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] = "";
-			$eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;";
-			eval($eval);
+			$OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
 			OUTPUT_HTML("<STRONG><SPAN class=\"register_failed\">".$OUT."</SPAN></STRONG><br /><br />");
 		}
 	}
@@ -114,6 +110,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
 	// Guests are mostly not interested in how many members has
 	// choosen an individual category
 	$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__);
@@ -134,13 +131,10 @@ 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") || (($_CONFIG['register_default'] == "Y") && (empty($_POST['cat'][$id])))) {
+				$content['def_y'] = " checked=\"checked\"";
+			} else {
+				$content['def_n'] = " checked=\"checked\"";
 			}
 
 			// Load template and switch color