X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=aa0ea1baf50f15528a477b178c3964e9b959cfb1;hp=34a6c0990e4e634c4393cea1afb33a55b08e502b;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hpb=56156f6c4392510cdbe0eb4f2ccefc23b43e2672

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 34a6c0990e..aa0ea1baf5 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer register-Erweiterung     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,13 +43,15 @@ 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)) {
+function REGISTER_FILL_MUST_CONSTANTS () {
+	$result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`",
+		__FUNCTION__, __LINE__);
+
+	while ($content = SQL_FETCHARRAY($result)) {
 		$value = "";
-		if ($required == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
-		$eval = "define('MUST_".strtoupper($name)."', \"".$value."\");";
+		if ($content['field_required'] == "Y") $value = "<div class=\\\"guest_failed\\\">&nbsp;(*)</div>";
+		// @TODO Rewrite these constants
+		$eval = "define('MUST_".strtoupper($content['field_name'])."', \"".$value."\");";
 		eval($eval);
 	} // END - while
 
@@ -57,18 +64,16 @@ function REGISTER_FILL_MUST_CONSTANTS()
 	define('MUST_BIRTH' , "<div class=\"guest_failed\">&nbsp;(*)</div>");
 	define('MUST_MARKER', "<div class=\"guest_failed\">&nbsp;(*)</div>");
 }
+
 //
-function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
-{
+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__);
-		if (SQL_NUMROWS($result) == 1)
-		{
+	foreach ($array as $key => $value) {
+		$result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1",
+			__FUNCTION__, __LINE__);
+		if (SQL_NUMROWS($result) == 1) {
 			// "Must-line" found
 			list($chk) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
 
 			// Check if extension country is not found (you have to enter the 2-chars long country code) or
 			// if extensions is present check if country code was selected
@@ -81,57 +86,65 @@ function REGISTER_CHECK_REQUIRED_FIELDS(&$array)
 				$ret = true;
 			}
 		}
+
+		// Free result
+		SQL_FREERESULT($result);
 	}
 	return $ret;
 }
+
 //
-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")) {
+function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) {
+	$result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
+	while ($content = SQL_FETCHARRAY($result)) {
+		if (($array[$content['field_name']] == "!") && ($content['field_required'] == "Y")) {
 			// Empty entry found
-			$array[$name] = "";
-			$OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED');
-			OUTPUT_HTML("<strong><span class=\"register_failed\">".$OUT."</span></strong><br /><br />");
-		}
-	}
+			$array[$content['field_name']] = "";
+			$OUT = constant('REGISTER_'.strtoupper($content['field_name']).'_REQUIRED');
+			OUTPUT_HTML("<div class=\"register_failed\">".$OUT."</div>");
+		} // END - if
+	} // END - while
 
 	// Free memory
 	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)
-	{
+
+	// Look for categories
+	$result = SQL_QUERY("SELECT id, cat, visible FROM `{!_MYSQL_PREFIX!}_cats` ".$AND." ORDER BY `sort`",
+		__FUNCTION__, __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))
-		{
-			if (empty($_POST['cat'][$id])) $_POST['cat'][$id] = "";
+		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n";
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Is the array element not set?
+			if (!REQUEST_ISSET_POST('cat', $content['id'])) {
+				// Then set it
+				REQUEST_SET_POST(array('cat', $content['id']), "");
+			} // END - if
+
 			// Prepare array for the template
 			$content = array(
 				'sw'    => $SW,
-				'cat'   => $cat,
+				'cat'   => $content['cat'],
 				'def_y' => "",
 				'def_n' => "",
-				'id'    => $id,
+				'id'    => $content['id'],
 			);
 
-			if (($_POST['cat'][$id] == "Y") || ((getConfig('register_default') == "Y") && (empty($_POST['cat'][$id])))) {
+			if ((REQUEST_POST('cat', $content['id']) == "Y") || ((getConfig('register_default') == "Y") && (!REQUEST_ISSET_POST('cat', $content['id'])))) {
 				$content['def_y'] = " checked=\"checked\"";
 			} else {
 				$content['def_n'] = " checked=\"checked\"";
@@ -141,24 +154,19 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false)
 			$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 === true) {
 		// Return generated HTML code
 		return $OUT;
-	}
-	 else
-	{
+	} else {
 		// Output directly (default)
 		OUTPUT_HTML($OUT);
 	}