X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=5ffff9c02f29f97cdae09c60e4d23c6f7aaf7910;hp=91cd13f633bf84d9fcccb1ad0e6c92a44e84b17d;hb=07612d2debcc78a93678db0deed050d82df432f1;hpb=11dea7bfe10a659183665aaa0a6cf08b5da66783

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 91cd13f633..5ffff9c02f 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 
 //
 function registerMustFillout () {
-	$result = SQL_QUERY("SELECT field_name, field_required FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`",
-	__FUNCTION__, __LINE__);
+	$result = SQL_QUERY("SELECT `field_name`, `field_required` FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id` ASC",
+		__FUNCTION__, __LINE__);
 
 	while ($content = SQL_FETCHARRAY($result)) {
 		$value = '';
@@ -67,36 +67,39 @@ function registerMustFillout () {
 }
 
 //
-function REGISTER_CHECK_REQUIRED_FIELDS (&$array) {
-	$ret = false;
+function ifRequiredRegisterFieldsAreSet (&$array) {
+	// By default all is fine
+	$ret = true;
 	foreach ($array as $key => $value) {
-		$result = SQL_QUERY("SELECT field_required FROM `{!_MYSQL_PREFIX!}_must_register` WHERE field_name='".$key."' LIMIT 1",
-		__FUNCTION__, __LINE__);
+		// Check all fields that must register
+		$result = SQL_QUERY("SELECT `id` FROM `{!_MYSQL_PREFIX!}_must_register` WHERE `field_name`='".$key."' AND `field_required`='Y' LIMIT 1",
+			__FUNCTION__, __LINE__);
 		if (SQL_NUMROWS($result) == 1) {
-			// "Must-line" found
-			list($chk) = SQL_FETCHROW($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
 			//         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))
-			{
+			$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)) && (!$country)) {
 				// Required field not set
 				$array[$key] = '!';
-				$ret = true;
-			}
-		}
+				$ret = false;
+			} // END - if
+		} // END - if
 
 		// Free result
 		SQL_FREERESULT($result);
-	}
+	} // END - foreach
+
+	// Return result
 	return $ret;
 }
 
-//
+// @TODO This function is no longer used???
 function REGISTER_OUTPUT_REQUIRE_CHECK (&$array) {
+	// Get all fields for output
 	$result = SQL_QUERY("SELECT `field_name`, `field_required` FROM `{!_MYSQL_PREFIX!}_must_register` ORDER BY `id`", __FUNCTION__, __LINE__);
+
+	// Loop through them
 	while ($content = SQL_FETCHARRAY($result)) {
 		if (($array[$content['field_name']] == '!') && ($content['field_required'] == 'Y')) {
 			// Empty entry found