X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=a97110740193836eac1601b5d051ba1ba29b3be0;hb=4f1b6f846331d1ec1b6822392aed12a309581b7c;hp=2c3025c6caf6cf1dbefeab00876ddaa07b9ba8fb;hpb=3849b8cc90bcf2a7f3b2e128e52b949f93abc84f;p=mailer.git

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 2c3025c6ca..a971107401 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -45,117 +45,9 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addMenuDescription('guest', __FILE__);
 
-// Init content
-$content = array(
-	'message' => '{--GUEST_CONFIRMED_FAILED--}',
-	'userid'  => 0,
-);
-
 if (isGetRequestParameterSet('hash')) {
-	// Initialize the user id
-	$userid = '0';
-
-	// Search for an unconfirmed or confirmed account
-	$result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
-		array(getRequestParameter('hash')), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
-		// Ok, he want's to confirm now so we load some data
-		list($userid, $email, $refid) = SQL_FETCHROW($result);
-
-		// Fetch user data
-		if (!fetchUserData($userid)) {
-			// Not found, should not happen
-			debug_report_bug(__FILE__, __LINE__, 'User account ' . $userid . ' not found.');
-		} // END - if
-
-		// Load all data and add points
-		$content = getUserDataArray();
-
-		// Unlock his account (but only when it is on UNCONFIRMED!)
-		SQL_QUERY_ESC("UPDATE
-	`{?_MYSQL_PREFIX?}_user_data`
-SET
-	`status`='CONFIRMED',
-	`ref_payout`={?ref_payout?},
-	`user_hash`=NULL
-WHERE
-	`user_hash`='%s' AND
-	`status`='UNCONFIRMED'
-LIMIT 1",
-			array(getRequestParameter('hash')), __FILE__, __LINE__);
-		if (SQL_AFFECTEDROWS() == 1) {
-			// Send email if updated
-			$message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
-
-			// And send him right away the confirmation mail
-			sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
-
-			// Maybe he got "referaled"?
-			if (($refid > 0) && ($refid != $userid)) {
-				// Select the referal userid
-				if (fetchUserData($refid)) {
-					// Update ref counter...
-					updateReferalCounter($refid);
-
-					// Shall I 'pay' the referal points imidiately?
-					if (getConfig('ref_payout') == '0') {
-						// Yes, 'pay' it now
-						$locked = false;
-					} else {
-						// No, 'pay' it later
-						$locked = true;
-					}
-
-					// If version matches add ref bonus to refid's account
-					if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (getConfig('bonus_active') == 'Y')) {
-						// Add points (directly only!)
-						SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `bonus_ref`=`bonus_ref`+{?bonus_ref?} WHERE `userid`=%s LIMIT 1",
-							array(bigintval($refid)), __FILE__, __LINE__);
-
-						// Subtract points from system
-						handleBonusPoints(getConfig('bonus_ref'));
-					} // END - if
-
-					// Add one-time referal bonus over referal system or directly
-					// @TODO Try to rewrite the following unset()
-					unset($GLOBALS['ref_level']);
-					addPointsThroughReferalSystem('referal_bonus', $refid, getConfig('points_ref'), true, bigintval($userid), $locked, getConfig('reg_points_mode'));
-				} // END - if
-			} // END - if
-
-			if (isExtensionActive('rallye')) {
-				// Add user to rallye (or not?)
-				addUserToReferalRallye(bigintval($userid));
-			} // END - if
-
-			// Account confirmed!
-			if (isExtensionActive('lead')) {
-				// Set special lead cookie
-				setSession('lead_userid', bigintval($userid));
-
-				// Lead-Code mode enabled
-				redirectToUrl('lead-confirm.php');
-			} else {
-				$content['message'] = '{--GUEST_CONFIRMED_DONE--}';
-				$content['userid']  = bigintval($userid);
-			}
-		} elseif (isExtensionActive('lead')) {
-			// Set special lead cookie
-			setSession('lead_userid', bigintval($userid));
-
-			// Lead-Code mode enabled
-			redirectToUrl('lead-confirm.php');
-		} else {
-			// Nobody was found unter this hash key... or our new member want's to confirm twice?
-			$content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
-		}
-	} else {
-		// Nobody was found unter this hash key... or our new member want's to confirm twice?
-		$content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
-	}
-
-	// Load template
-	loadTemplate('admin_settings_saved', false, $content['message']);
+	// Do user account confirmation
+	doConfirmUserAccount(getRequestParameter('hash'));
 } elseif ((isFormSent()) && (isPostRequestParameterSet('email'))) {
 	// Confirmation link requested      0         1          2
 	if (fetchUserData(postRequestParameter('email'), 'email')) {
@@ -169,7 +61,7 @@ LIMIT 1",
 				$message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
 				// Send email
-				sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJ--}', $message);
+				sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
 
 				// And set message
 				$content['message'] = '{--CONFIRM_LINK_SENT--}';