X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=85af2723d934b35d61c1673b0d626ba1bbadedaf;hb=b6c301dece2d7a3375321d4f3c0498ceaeb5a2a6;hp=4bfdd0484f4c3189d177da7ab131de8511ba2b84;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 4bfdd0484f..85af2723d9 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -109,7 +109,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 		SQL_FREERESULT($result);
 	} else {
 		// No categories setted up so far...
-		$OUT .= loadTemplate('admin_settings_saved', true, '{--NO_CATEGORIES_VISIBLE--}');
+		$OUT .= displayMessage('{--NO_CATEGORIES_VISIBLE--}', true);
 	}
 
 	if ($return === true) {
@@ -130,31 +130,6 @@ function registerOutputFailedMessage ($messageId, $extra='') {
 	}
 }
 
-// Run a filter for must-fillout fields
-function FILTER_REGISTER_MUST_FILLOUT ($content) {
-	// Get all fields for output
-	$result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
-		__FUNCTION__, __LINE__);
-
-	// Walk through all entries
-	while ($row = SQL_FETCHARRAY($result)) {
-		// Must the user fill out this element?
-		$value = '';
-		if ($row['field_required'] == 'Y') {
-			$value = '<span class="notice">(*)</span>';
-		} // END - if
-
-		// Add it
-		$content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
-	} // END - while
-
-	// Free memory
-	SQL_FREERESULT($result);
-
-	// Return it
-	return $content;
-}
-
 // Checks wether the registration data is complete
 function isRegistrationDataComplete () {
 	// Init elements
@@ -302,8 +277,8 @@ function doRegistration () {
 		detectServerName() . getEncryptSeperator() .
 		detectRemoteAddr() . getEncryptSeperator() .
 		detectUserAgent() . '/' .
-		getConfig('SITE_KEY') . '/' .
-		getConfig('DATE_KEY') . '/' .
+		getSiteKey() . '/' .
+		getDateKey() . '/' .
 		getConfig('CACHE_BUSTER')
 	));
 
@@ -375,7 +350,7 @@ function doRegistration () {
 	// Did this work?
 	if ($userid == '0') {
 		// Something bad happened!
-		loadTemplate('admin_settings_saved', false, '{--USER_NOT_REGISTERED--}');
+		displayMessage('{--USER_NOT_REGISTERED--}');
 
 		// Stop here
 		return;