X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=fcbbddb482f44af4b7a450b87d5852839fcafa5e;hb=bd9c1581b892ef89831a67dc2c18b8e3362f005f;hp=6fb1d870258ca676226d4c1c2f1c8d8eef9299b3;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 6fb1d87025..fcbbddb482 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -47,7 +47,7 @@ addMenuDescription('guest', __FILE__);
 
 // Init content
 $content = array(
-	'message' => getMessage('GUEST_CONFIRMED_FAILED'),
+	'message' => '{--GUEST_CONFIRMED_FAILED--}',
 	'userid'  => 0,
 );
 
@@ -56,39 +56,46 @@ if (isGetRequestParameterSet('hash')) {
 	$userid = '0';
 
 	// Search for an unconfirmed or confirmed account
-	$result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid`,`gender` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
+	$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, $rid, $gender) = SQL_FETCHROW($result);
+		list($userid, $email, $refid) = SQL_FETCHROW($result);
 
 		// Fetch user data
 		if (!fetchUserData($userid)) {
 			// Not found, should not happen
-			debug_report_bug('User account ' . $userid . ' not found.');
+			debug_report_bug(__FILE__, __LINE__, 'User account ' . $userid . ' not found.');
 		} // END - if
 
 		// Load all data and add points
 		$content = getUserDataArray();
-		$content['gender'] = translateGender($content['gender']);
-		$content['points'] = getConfig('points_register');
 
 		// 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",
+		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, getMessage('GUEST_THANX_CONFIRM'), $message);
+			sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
 
 			// Maybe he got "referaled"?
-			if (($rid > 0) && ($rid != $userid)) {
+			if (($refid > 0) && ($refid != $userid)) {
 				// Select the referal userid
-				if (fetchUserData($rid)) {
+				if (fetchUserData($refid)) {
 					// Update ref counter...
-					updateReferalCounter($rid);
+					updateReferalCounter($refid);
 
 					// Shall I 'pay' the referal points imidiately?
 					if (getConfig('ref_payout') == '0') {
@@ -100,10 +107,10 @@ if (isGetRequestParameterSet('hash')) {
 					}
 
 					// If version matches add ref bonus to refid's account
-					if ((getExtensionVersion('bonus') >= '0.4.4') && (getConfig('bonus_active') == 'Y')) {
+					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($rid)), __FILE__, __LINE__);
+							array(bigintval($refid)), __FILE__, __LINE__);
 
 						// Subtract points from system
 						handleBonusPoints(getConfig('bonus_ref'));
@@ -112,7 +119,7 @@ if (isGetRequestParameterSet('hash')) {
 					// Add one-time referal bonus over referal system or directly
 					// @TODO Try to rewrite the following unset()
 					unset($GLOBALS['ref_level']);
-					addPointsThroughReferalSystem('referal_bonus', $rid, getConfig('points_ref'), true, bigintval($userid), $locked, getConfig('reg_points_mode'));
+					addPointsThroughReferalSystem('referal_bonus', $refid, getConfig('points_ref'), true, bigintval($userid), $locked, getConfig('reg_points_mode'));
 				} // END - if
 			} // END - if
 
@@ -129,7 +136,7 @@ if (isGetRequestParameterSet('hash')) {
 				// Lead-Code mode enabled
 				redirectToUrl('lead-confirm.php');
 			} else {
-				$content['message'] = getMessage('GUEST_CONFIRMED_DONE');
+				$content['message'] = '{--GUEST_CONFIRMED_DONE--}';
 				$content['userid']  = bigintval($userid);
 			}
 		} elseif (isExtensionActive('lead')) {
@@ -140,11 +147,11 @@ if (isGetRequestParameterSet('hash')) {
 			redirectToUrl('lead-confirm.php');
 		} else {
 			// Nobody was found unter this hash key... or our new member want's to confirm twice?
-			$content['message'] = getMessage('GUEST_CONFIRMED_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'] = getMessage('GUEST_CONFIRMED_TWICE');
+		$content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
 	}
 
 	// Load template
@@ -162,23 +169,23 @@ if (isGetRequestParameterSet('hash')) {
 				$message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
 				// Send email
-				sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+				sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
 
 				// And set message
-				$content['message'] = getMessage('CONFIRM_LINK_SENT');
+				$content['message'] = '{--CONFIRM_LINK_SENT--}';
 				break;
 
 			case 'CONFIRMED': // Account already confirmed
-				$content['message'] = getMessage('LOGIN_ID_CONFIRMED');
+				$content['message'] = '{--LOGIN_ID_CONFIRMED--}';
 				break;
 
 			case 'LOCKED': // Account is locked
-				$content['message'] = getMessage('LOGIN_ID_LOCKED');
+				$content['message'] = '{--LOGIN_ID_LOCKED--}';
 				break;
 		} // END - switch
 	} else {
 		// Email address not registered
-		$content['message'] = getMessage('EMAIL_404');
+		$content['message'] = '{--EMAIL_404--}';
 	}
 
 	// Load template