X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=7e08dcbdf89638d2f19cff87944b261681240589;hp=cfbca85c3f9c03b8379451e5063ee89e4136526e;hb=5f25dbe2aab8c57f820caaf48708bef1dd56f417;hpb=15d03825972c38fbd95abad41f304c7494c5a70e

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index cfbca85c3f..7e08dcbdf8 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -84,7 +84,7 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 	if (isAdmin()) $AND = '';
 
 	// Look for categories
-	$result = SQL_QUERY("SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ".$AND." ORDER BY `sort` ASC",
+	$result = SQL_QUERY('SELECT `id`, `cat`, `visible` FROM `{?_MYSQL_PREFIX?}_cats` ' . $AND . ' ORDER BY `sort` ASC',
 		__FUNCTION__, __LINE__);
 
 	if (!SQL_HASZERONUMS($result)) {
@@ -92,18 +92,14 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 		$OUT .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare array for the template
-			$content = array(
-				'cat'   => $content['cat'],
-				'def_y' => '',
-				'def_n' => '',
-				'id'    => $content['id'],
-			);
+			$content['default_yes'] = '';
+			$content['default_no']  = '';
 
 			// Mark categories
 			if ((postRequestParameter('cat', $content['id']) == 'Y') || ((getConfig('register_default') == 'Y') && (!isPostRequestParameterSet('cat', $content['id'])))) {
-				$content['def_y'] = ' checked="checked"';
+				$content['default_yes'] = ' checked="checked"';
 			} else {
-				$content['def_n'] = ' checked="checked"';
+				$content['default_no']  = ' checked="checked"';
 			}
 
 			// Load template and switch color
@@ -130,16 +126,16 @@ function registerGenerateCategoryTable ($mode, $return=false) {
 // Outputs a 'failed message'
 function registerOutputFailedMessage ($messageId, $extra='') {
 	if (empty($messageId)) {
-		outputHtml('<div class="register_failed">' . $extra . '</div>');
+		outputHtml('<div class="guest_failed">' . $extra . '</div>');
 	} else {
-		outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+		outputHtml('<div class="guest_failed">{--' . $messageId . '--}' . $extra . '</div>');
 	}
 }
 
 // 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",
+	$result = SQL_QUERY('SELECT `field_name`, `field_required` FROM `{?_MYSQL_PREFIX?}_must_register` ORDER BY `id` ASC',
 		__FUNCTION__, __LINE__);
 
 	// Walk through all entries
@@ -149,7 +145,7 @@ function FILTER_REGISTER_MUST_FILLOUT ($content) {
 		if ($row['field_required'] == 'Y') $value = '<span class="guest_failed">(*)</span>';
 
 		// Add it
-		$content['must_fillout_'.strtolower($row['field_name']).''] = $value;
+		$content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
 	} // END - while
 
 	// Free memory
@@ -298,28 +294,22 @@ function doRegistration () {
 	$GLOBALS['register_sql_data'] = '';
 	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
 		// Okay, add design here
-		$GLOBALS['register_sql_columns'] = ', `curr_theme`';
-		$GLOBALS['register_sql_data'] = ", '" . getCurrentTheme() . "'";
+		$GLOBALS['register_sql_columns'] .= ', `curr_theme`';
+		$GLOBALS['register_sql_data']    .= ", '" . getCurrentTheme() . "'";
 	} // END - if
 
 	// Check if I shall disable sending mail to newly registered members out about active/begging rallye
 	//
 	// First comes first: begging rallye
-	if (isExtensionInstalledAndNewer('beg', '0.2.8')) {
-		// Okay, shall I disable now?
-		if (getConfig('beg_new_member_notify') != 'Y') {
-			$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
-			$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-		} // END - if
+	if (!isBegNewMemberNotifyEnabled()) {
+		$GLOBALS['register_sql_columns'] .= ', `beg_rallye_enable_notify`, `beg_rallye_disable_notify`';
+		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
 	// Second: active rallye
-	if (isExtensionInstalledAndNewer('bonus', '0.9.2')) {
-		// Okay, shall I disable now?
-		if (getConfig('bonus_new_member_notify') != 'Y') {
-			$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
-			$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-		} // END - if
+	if (!isBonusNewMemberNotifyEnabled()) {
+		$GLOBALS['register_sql_columns'] .= ', `bonus_rallye_enable_notify`, `bonus_rallye_disable_notify`';
+		$GLOBALS['register_sql_data']    .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
 	} // END - if
 
 	// Write user data to table
@@ -329,10 +319,7 @@ function doRegistration () {
 		$countryData = bigintval(postRequestParameter('country_code'));
 	} // END - if
 
-	//////////////////////////////
-	// Create user's account... //
-	//////////////////////////////
-	//
+	// Create user's account...
 	SQL_QUERY_ESC("INSERT INTO
 	`{?_MYSQL_PREFIX?}_user_data`
 (`gender`, `surname`, `family`, `street_nr`,%s, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `password`, `max_mails`, `receive_mails`, `refid`, `status`, `user_hash`, `REMOTE_ADDR`, `joined`, `last_update`".$GLOBALS['register_sql_columns'].")
@@ -401,34 +388,34 @@ function doRegistration () {
 		// Prepare data array for the email template
 		// Start with the gender...
 		$content = array(
-			'hash'    => $hash,
-			'userid'  => $userid,
-			'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
-			'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-			'family'  => SQL_ESCAPE(postRequestParameter('family')),
-			'email'   => SQL_ESCAPE(postRequestParameter('email')),
-			'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-			'city'    => SQL_ESCAPE(postRequestParameter('city')),
-			'zip'     => bigintval(postRequestParameter('zip')),
-			'country' => $countryData,
-			'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-			'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+			'hash'     => $hash,
+			'userid'   => $userid,
+			'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+			'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+			'family'   => SQL_ESCAPE(postRequestParameter('family')),
+			'email'    => SQL_ESCAPE(postRequestParameter('email')),
+			'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+			'city'     => SQL_ESCAPE(postRequestParameter('city')),
+			'zip'      => bigintval(postRequestParameter('zip')),
+			'country'  => $countryData,
+			'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+			'password' => SQL_ESCAPE(postRequestParameter('pass1')),
 		);
 	} else {
 		// No ZIP code entered
 		$content = array(
-			'hash'    => $hash,
-			'userid'  => $userid,
-			'gender'  => SQL_ESCAPE(postRequestParameter('gender')),
-			'surname' => SQL_ESCAPE(postRequestParameter('surname')),
-			'family'  => SQL_ESCAPE(postRequestParameter('family')),
-			'email'   => SQL_ESCAPE(postRequestParameter('email')),
-			'street'  => SQL_ESCAPE(postRequestParameter('street_nr')),
-			'city'    => SQL_ESCAPE(postRequestParameter('city')),
-			'zip'     => '',
-			'country' => $countryData,
-			'refid'   => SQL_ESCAPE(postRequestParameter('refid')),
-			'pass'    => SQL_ESCAPE(postRequestParameter('pass1')),
+			'hash'     => $hash,
+			'userid'   => $userid,
+			'gender'   => SQL_ESCAPE(postRequestParameter('gender')),
+			'surname'  => SQL_ESCAPE(postRequestParameter('surname')),
+			'family'   => SQL_ESCAPE(postRequestParameter('family')),
+			'email'    => SQL_ESCAPE(postRequestParameter('email')),
+			'street'   => SQL_ESCAPE(postRequestParameter('street_nr')),
+			'city'     => SQL_ESCAPE(postRequestParameter('city')),
+			'zip'      => '',
+			'country'  => $countryData,
+			'refid'    => SQL_ESCAPE(postRequestParameter('refid')),
+			'password' => SQL_ESCAPE(postRequestParameter('pass1')),
 		);
 	}