X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fregister_functions.php;h=2eac520fe61802cff03aab275fc57ad9ef7d6aac;hp=8a3880c9405cd47ad2824b634de5d82f69e42eba;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hpb=506745902f724f253446f545671eb2d562f1725b

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index 8a3880c940..2eac520fe6 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -14,8 +14,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 //
 function ifRequiredRegisterFieldsAreSet (&$array) {
@@ -84,7 +82,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)) {
@@ -126,23 +124,23 @@ 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="notice">' . $extra . '</div>');
 	} else {
-		outputHtml('<div class="register_failed">{--' . $messageId . '--}' . $extra . '</div>');
+		outputHtml('<div class="notice">{--' . $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
 	while ($row = SQL_FETCHARRAY($result)) {
 		// Must the user fill out this element?
 		$value = '';
-		if ($row['field_required'] == 'Y') $value = '<span class="guest_failed">(*)</span>';
+		if ($row['field_required'] == 'Y') $value = '<span class="notice">(*)</span>';
 
 		// Add it
 		$content['must_fillout_' . strtolower($row['field_name']) . ''] = $value;
@@ -260,19 +258,14 @@ function doRegistration () {
 	if (strlen(postRequestParameter('day'))   == 1) setPostRequestParameter('day'  , '0' . postRequestParameter('day'));
 	if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', '0' . postRequestParameter('month'));
 
-	// Get total ...
-	// ... confirmed, ...
-	$confirmedUsers   = getTotalConfirmedUser();
-	// ... unconfirmed ...
-	$unconfirmedUsers = getTotalUnconfirmedUser();
-	// ... and locked users!
-	$lockedUsers      = getTotalLockedUser();
-
 	// Generate hash which will be inserted into confirmation mail
 	$hash = generateHash(sha1(
-		$confirmedUsers . getEncryptSeperator() .
-		$unconfirmedUsers . getEncryptSeperator() .
-		$lockedUsers . getEncryptSeperator() .
+		// Get total confirmed, ...
+		getTotalConfirmedUser() . getEncryptSeperator() .
+		// ... unconfirmed ...
+		getTotalUnconfirmedUser() . getEncryptSeperator() .
+		// ... and locked users!
+		getTotalLockedUser() . getEncryptSeperator() .
 		postRequestParameter('month') . '-' .
 		postRequestParameter('day') . '-' .
 		postRequestParameter('year') . getEncryptSeperator() .
@@ -319,10 +312,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'].")
@@ -384,41 +374,41 @@ function doRegistration () {
 	} // END - if
 
 	// ... rewrite a zero referal id to the main title
-	if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getMainTitle());
+	if (!isValidUserId(postRequestParameter('refid'))) setPostRequestParameter('refid', getMainTitle());
 
 	// Is ZIP code set?
 	if (isPostRequestParameterSet('zip')) {
 		// 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')),
 		);
 	}