X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=5c0dcb49467a423e911e4b1a8a058f1c59d9d7c6;hp=c2baa161c6c29abf2bb5fbbc114267336c96d2b9;hb=a524135c24dd0a8fa359c9a92399467d50fd69e0;hpb=f3c5b763e15cf8a6106cf259189a24e80636302b

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c2baa161c6..5c0dcb4946 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -580,7 +580,7 @@ function doConfirmUserAccount ($hash) {
 		array($hash), __FILE__, __LINE__);
 
 	// One result should be found
-	if (ifSqlHasZeroNums($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// Nothing found or tried to confirm twice?
 		displayMessage('{--GUEST_CONFIRMED_TWICE--}');
 		return;
@@ -596,10 +596,30 @@ function doConfirmUserAccount ($hash) {
 	} // END - if
 
 	// Load all data and add points
-	$content = getUserDataArray();
+	$content = merge_array($content, getUserDataArray());
 
-	// Unlock his account (but only when it is on UNCONFIRMED!)
-	sqlQueryEscaped("UPDATE
+	// Is 'user' updated?
+	if (isExtensionInstalledAndNewer('user', '0.6.3')) {
+		// Unlock his account (but only when it is on UNCONFIRMED!)
+		sqlQueryEscaped("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`status`='CONFIRMED',
+	`user_hash`=NULL,
+	`confirmed_timestamp`=NOW(),
+	`confirmed_ip_address`='%s'
+WHERE
+	`user_hash`='%s' AND
+	`status`='UNCONFIRMED'
+LIMIT 1",
+			array(
+				determineRealRemoteAddress(),
+				$hash
+			), __FILE__, __LINE__
+		);
+	} else {
+		// Unlock his account (but only when it is on UNCONFIRMED!)
+		sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`status`='CONFIRMED',
@@ -608,7 +628,11 @@ WHERE
 	`user_hash`='%s' AND
 	`status`='UNCONFIRMED'
 LIMIT 1",
-		array($hash), __FILE__, __LINE__);
+			array(
+				$hash
+			), __FILE__, __LINE__
+		);
+	}
 
 	// Was it updated?
 	if (ifSqlHasZeroAffectedRows()) {