X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-register.php;h=827231b4996958e2015ba68c06b20b6ad8e81d07;hp=3b7d77f2d1bea4b95bee11e4de23ba33343d841d;hb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;hpb=724e353b74fd904f82d287c9fa53cdaf79ef3508

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index 3b7d77f2d1..827231b499 100644
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -52,322 +52,11 @@ if (!isExtensionActive('register')) {
 	return;
 }
 
-// Initialize variables
-$isOkay     = true;
-$shortPass  = false;
-$cats       = '0';
-$ipTimedOut = false;
-
-// Default refid is zero
-setPostRequestParameter('refid', 0);
-if (determineReferalId() > 0) {
-	// Test if the refid is valid
-	if (!fetchUserData(determineReferalId())) {
-		// Not found so we set your refid!
-		setPostRequestParameter('refid', getConfig('def_refid'));
-		setSession('refid', getConfig('def_refid'));
-	} else {
-		// Use the refid here
-		setPostRequestParameter('refid', determineReferalId());
-	}
-} // END - if
-
-if (isFormSent()) {
-	// First we only check the submitted data then we continue... :)
-	//
-	// Did he agree to our Terms Of Usage?
-	if (postRequestParameter('agree') != 'Y') {
-		setPostRequestParameter('agree', '!');
-		$isOkay = false;
-	} // END - if
-
-	// Did he enter a valid email address? (we really don't care about
-	// that, he has to click on a confirmation link :P )
-	if ((!isPostRequestParameterSet('email')) || (!isEmailValid(postRequestParameter('email')))) {
-		setPostRequestParameter('email', '!');
-		$isOkay = false;
-	} // END - if
-
-	// And what about surname and family's name?
-	if (!isPostRequestParameterSet('surname')) {
-		setPostRequestParameter('surname', '!');
-		$isOkay = false;
-	} // END - if
-	if (!isPostRequestParameterSet('family')) {
-		setPostRequestParameter('family', '!');
-		$isOkay = false;
-	} // END - if
-
-	// Get temporary array for modification
-	$postArray = postRequestArray();
-
-	// Check for required fields
-	if ($isOkay === true) $isOkay = ifRequiredRegisterFieldsAreSet($postArray);
-
-	// Set it back in request
-	setPostRequestArray($postArray);
-
-	// Did he enter his password twice?
-	if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
-		if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
-			setPostRequestParameter('pass1', '!');
-			setPostRequestParameter('pass2', '!');
-		} else {
-			if (!isPostRequestParameterSet('pass1')) { setPostRequestParameter('pass1', '!'); } else { setPostRequestParameter('pass1', ''); }
-			if (!isPostRequestParameterSet('pass2')) { setPostRequestParameter('pass2', '!'); } else { setPostRequestParameter('pass2', ''); }
-		}
-		$isOkay = false;
-	} // END - if
-
-	// Is the password long enouth?
-	if ((strlen(postRequestParameter('pass1')) < getConfig('pass_len')) && ($isOkay === true)) {
-		$shortPass = true;
-		$isOkay = false;
-	} // END - if
-
-	// No admin? Admins can always register!
-	if (!isAdmin()) {
-		// Do this check only when no admin is logged in
-		foreach (postRequestParameter('cat') as $id => $answer) {
-			if ($answer == 'Y') $cats++;
-		} // END - foreach
-
-		if ($cats < getConfig('least_cats')) {
-			// ... nope!
-			$isOkay = false;
-		} // END - if
-	} // END - if
-
-	if ((postRequestParameter('email') != '!') && (getConfig('check_double_email') == 'Y')) {
-		// Does the email address already exists in our database?
-		if ((!isAdmin()) && (isEmailTaken(postRequestParameter('email')))) {
-			setPostRequestParameter('email', '?');
-			$isOkay = false;
-		} // END - if
-	} // END - if
-
-	// Check for IP timeout?
-	if (getConfig('ip_timeout') > 0) {
-		// Check his IP number
-		$result = SQL_QUERY_ESC("SELECT
-	`userid`
-FROM
-	`{?_MYSQL_PREFIX?}_user_data`
-WHERE
-	`REMOTE_ADDR`='%s' AND
-	(`joined` > (UNIX_TIMESTAMP() - {?ip_timeout?}) OR `last_update` > (UNIX_TIMESTAMP() - {?ip_timeout?}))
-LIMIT 1",
-			array(detectRemoteAddr()), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
-			// Same IP in timeout range and different email address entered... Eat this, faker! ;-)
-			// But admins are allowed to fake their own exchange service.
-			$ipTimedOut = true;
-			$isOkay = false;
-		} // END - if
-
-		// Free memory
-		SQL_FREERESULT($result);
-	} // END - if
-} // END - if
-
-// Is the form sent and all went fine or admin logged in?
-//* DEBUG: */ print intval(isFormSent()).'/'.intval($isOkay).'/'.intval(isAdmin()).'<br />';
-if ((isFormSent()) && (($isOkay === true) || (isAdmin()))) {
-	// Prepapre month and day of birth
-	if (strlen(postRequestParameter('day'))   == 1) setPostRequestParameter('day'  , 0 . postRequestParameter('day'));
-	if (strlen(postRequestParameter('month')) == 1) setPostRequestParameter('month', 0 . postRequestParameter('month'));
-
-	// Get total ...
-	// ... confirmed, ...
-	$confirmedUsers   = countSumTotalData('CONFIRMED'  , 'user_data', 'userid', 'status', true);
-	// ... unconfirmed ...
-	$unconfirmedUsers = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
-	// ... and locked users!
-	$lockedUsers      = countSumTotalData('LOCKED'     , 'user_data', 'userid', 'status', true);
-
-	// Generate hash which will be inserted into confirmation mail
-	$hash = generateHash(sha1($confirmedUsers.getConfig('ENCRYPT_SEPERATOR').$unconfirmedUsers.getConfig('ENCRYPT_SEPERATOR').$lockedUsers.getConfig('ENCRYPT_SEPERATOR').postRequestParameter('month') . '-'.postRequestParameter('day') . '-'.postRequestParameter('year').getConfig('ENCRYPT_SEPERATOR').getenv('SERVER_NAME').getConfig('ENCRYPT_SEPERATOR').detectRemoteAddr().getConfig('ENCRYPT_SEPERATOR').detectUserAgent() . '/' . getConfig('SITE_KEY') . '/' . getConfig('DATE_KEY') . '/'. getConfig('CACHE_BUSTER')));
-
-	// Add design when extension sql_patches is v0.2.7 or greater
-	// @TODO Rewrite these all to a single filter
-	$ADD1 = '';
-	$ADD2 = '';
-	if (isExtensionInstalledAndNewer('theme', '0.0.8')) {
-		// Okay, add design here
-		$ADD1 = ', `curr_theme`';
-		$ADD2 = ", '".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.1.7')) {
-		// Okay, shall I disable now?
-		if (getConfig('beg_new_mem_notify') != 'Y') {
-			$ADD1 .= ', `beg_ral_notify`, `beg_ral_en_notify`';
-			$ADD2 .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-		} // END - if
-	} // END - if
-
-	// Second: active rallye
-	if (isExtensionInstalledAndNewer('bonus', '0.7.7')) {
-		// Okay, shall I disable now?
-		if (getConfig('bonus_new_mem_notify') != 'Y') {
-			$ADD1 .= ', `bonus_ral_notify`, `bonus_ral_en_notify`';
-			$ADD2 .= ', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()';
-		} // END - if
-	} // END - if
-
-	// Write user data to table
-	if (isExtensionActive('country')) {
-		// Save with new selectable country code
-		$countryRow = '`country_code`';
-		$countryData = bigintval(postRequestParameter('country_code'));
-	} else {
-		// Old way with enterable two-char-code
-		$countryRow = '`country`';
-		$countryData = substr(postRequestParameter('cntry'), 0, 2);
-	}
-
-	//////////////////////////////
-	// 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".$ADD1.")
-VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONFIRMED','%s','%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
-	array(
-		$countryRow,
-		substr(postRequestParameter('gender'), 0, 1),
-		postRequestParameter('surname'),
-		postRequestParameter('family'),
-		postRequestParameter('street_nr'),
-		$countryData,
-		bigintval(postRequestParameter('zip')),
-		postRequestParameter('city'),
-		postRequestParameter('email'),
-		bigintval(postRequestParameter('day')),
-		bigintval(postRequestParameter('month')),
-		bigintval(postRequestParameter('year')),
-		generateHash(postRequestParameter('pass1')),
-		bigintval(postRequestParameter('max_mails')),
-		bigintval(postRequestParameter('max_mails')),
-		bigintval(postRequestParameter('refid')),
-		$hash,
-		detectRemoteAddr(),
-	), __FILE__, __LINE__);
-
-	// Get his userid
-	$userid = SQL_INSERTID();
-
-	// Did this work?
-	if ($userid == '0') {
-		// Something bad happened!
-		loadTemplate('admin_settings_saved', false, getMessage('USER_NOT_REGISTERED'));
-		return;
-	} // END - if
-
-	// Is the refback extension there?
-	// @TODO Rewrite this to a filter
-	if (isExtensionActive('refback')) {
-		// Update refback table
-		updateRefbackTable($userid);
-	} // END - if
-
-	// Write his welcome-points
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s AND `ref_depth`=0 LIMIT 1",
-		array(bigintval($userid)), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == '0') {
-		// Add only when the line was not found (maybe some more secure?)
-		$locked = 'points';
-
-		// Pay him later. First he has to confirm some mails!
-		if (getConfig('ref_payout') > 0) $locked = 'locked_points';
-
-		// @TODO Rewrite this to addPointsDirectly()
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `".$locked."`) VALUES (%s,0,'{?points_register?}')",
-			array(bigintval($userid)), __FILE__, __LINE__);
-
-		// Update mediadata as well
-		if ((isExtensionInstalledAndNewer('mediadata', '0.0.4')) && ($locked == 'points')) {
-			// Update database
-			updateMediadataEntry(array('total_points'), 'add', getConfig('points_register'));
-		} // END - if
-	} // END - if
-
-	// Write catgories
-	if ((is_array(postRequestParameter('cat'))) && (count(postRequestParameter('cat')))) {
-		foreach (postRequestParameter('cat') as $cat => $joined) {
-			if ($joined == 'Y') {
-				// Insert category entry
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_cats` (userid, cat_id) VALUES (%s, %s)",
-				array(bigintval($userid), bigintval($cat)), __FILE__, __LINE__);
-			} // END - if
-		} // END - foreach
-	} // END - if
-
-	// Rewrite gender
-	$gender = translateGender(postRequestParameter('gender'));
-
-	// ... rewrite a zero referal id to the main title
-	if (postRequestParameter('refid') == '0') setPostRequestParameter('refid', getConfig('MAIN_TITLE'));
-
-	// 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'  => $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')),
-		);
-	} else {
-		// No ZIP code entered
-		$content = array(
-			'hash'    => $hash,
-			'userid'  => $userid,
-			'gender'  => $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')),
-		);
-	}
-
-	// Continue with birthday...
-	switch (getLanguage()) {
-		case 'de':
-			$content['birthday'] = bigintval(postRequestParameter('day')) . '.' . bigintval(postRequestParameter('month')) . '.' . bigintval(postRequestParameter('year'));
-			break;
-
-		default:
-			$content['birthday'] = bigintval(postRequestParameter('month')) . '/' . bigintval(postRequestParameter('day')) . '/' . bigintval(postRequestParameter('year'));
-			break;
-	} // END - switch
-
-	// Display information to the user that he got mail and send it away
-	$messageGuest = loadEmailTemplate('register-member', $content, $userid);
-
-	// Send mail to user (confirmation link!)
-	$email = $content['email'];
-	sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
-	$content['email'] = $email;
-
-	// Send mail to admin
-	sendAdminNotification(getMessage('ADMIN_SUBJECT_NEW_ACCOUNT'), 'register-admin', $content, $userid);
+// Is the form sent and all went fine?
+//* DEBUG: */ print intval(isFormSent()) . '/' . intval(isRegistrationDataComplete()) . '/' . intval(isAdmin()) . '<br />';
+if ((isFormSent()) && (isRegistrationDataComplete())) {
+	// Do the registration here
+	doRegistration();
 
 	// Output success registration
 	loadTemplate('admin_settings_saved', false, getMessage('REGISTRATION_DONE'));
@@ -402,15 +91,15 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 		registerOutputFailedMessage('ENTER_PASS2');
 	}
 
-	if ($shortPass === true) {
+	if ($GLOBALS['registration_short_password'] === true) {
 		registerOutputFailedMessage('SHORT_PASS', ': ' . getConfig('pass_len'));
 	} // END - if
 
-	if ($ipTimedOut === true) {
+	if ($GLOBALS['registration_ip_timeout'] === true) {
 		registerOutputFailedMessage('REMOTE_ADDR_TIMEOUT');
 	} // END - if
 
-	if ((!empty($cats)) && ($cats < getConfig('least_cats'))) {
+	if ((!empty($GLOBALS['register_selected_cats'])) && ($GLOBALS['register_selected_cats'] < getConfig('least_cats'))) {
 		registerOutputFailedMessage('', getMessage('CATS_LEAST'));
 	} // END - if