X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-confirm.php;h=f6fbe748479a45d39ee76e26353a9a0619b22d7c;hp=722cfe2df42343cfe98e6faafa744a51a7589b69;hb=a49d1f4613f3f7d47fb57d946e9f7f705bd34a9b;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 722cfe2df4..f6fbe74847 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -55,17 +55,29 @@ if (isGetRequestElementSet('hash')) {
 	$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",
+	$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",
 		array(getRequestElement('hash')), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Ok, he want's to confirm now so we load some data
-		list ($userid, $email, $rid) = SQL_FETCHROW($result);
+		list($userid, $email, $rid, $gender) = SQL_FETCHROW($result);
+
+		// Fetch user data
+		if (!fetchUserData($userid)) {
+			// Not found, should not happen
+			debug_report_bug('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",
 			array(getRequestElement('hash')), __FILE__, __LINE__);
 		if (SQL_AFFECTEDROWS() == 1) {
-			$message = loadEmailTemplate('confirm-member', array('points' => getConfig('points_register')), bigintval($userid));
+			// 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);
@@ -73,9 +85,7 @@ if (isGetRequestElementSet('hash')) {
 			// Maybe he got "referaled"?
 			if (($rid > 0) && ($rid != $userid)) {
 				// Select the referal userid
-				$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-					array(bigintval($rid)), __FILE__, __LINE__);
-				if (SQL_NUMROWS($result) == 1) {
+				if (fetchUserData($rid)) {
 					// Update ref counter...
 					updateReferalCounter($rid);
 
@@ -137,14 +147,14 @@ if (isGetRequestElementSet('hash')) {
 	}
 
 	// Load template
-	loadTemplate('guest_confirm_table', false, $content);
+	loadTemplate('admin_settings_saved', false, $content['message']);
 } elseif ((isFormSent()) && (isPostRequestElementSet('email'))) {
 	// Confirmation link requested      0         1          2
-	$result = SQL_QUERY_ESC("SELECT `userid`, `status`, `user_hash` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' LIMIT 1",
-		array(postRequestElement('email')), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
+	if (fetchUserData(postRequestElement('email'), 'email')) {
 		// Email address found
-		$content = SQL_FETCHARRAY($result);
+		$content = getUserDataArray();
+
+		// Detect status
 		switch ($content['status']) {
 			case 'UNCONFIRMED': // Account not confirmed
 				// Load email template