X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Freset%2Freset_profile.php;h=825023575e0247f0ce57a3e4a34d8818fdcc8500;hp=5cfe43e12ef90754986eb019e6dd5edf7fb28708;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hpb=c72268213d4d4829d845d39c101bb08fbe4ed79a

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 5cfe43e12e..825023575e 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -41,7 +41,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getScriptOutputMode() != 0) || (!isResetModeEnabled())) {
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
 	// Do not execute when script is in CSS mode or no daily reset
 	return;
 } elseif (!isExtensionActive('profile')) {
@@ -49,22 +49,29 @@ if (!defined('__SECURITY')) {
 	return;
 }
 
-if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
+if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
 	// Load personal data
-	$result = SQL_QUERY("SELECT `userid`, `email`, `last_update`, `joined`
+	$result = SQL_QUERY("SELECT
+	`userid`, `email`, `last_update`, `joined`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	(`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
-	`last_update` != 0 AND
-	`last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?}))
-OR
-	(`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - {?profile_update?}))
+	`status`='CONFIRMED' AND (
+		(
+			`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+			`last_update` > 0 AND
+			`last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?})
+		) OR (
+			`last_update` = 0 AND
+			`last_profile_sent` = 0 AND
+			`joined` < (UNIX_TIMESTAMP() - {?profile_update?})
+		)
+	)
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
 	// Do we have some notifications to sent?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// We need to send-out notifications...
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Translate timestamp
@@ -72,15 +79,15 @@ ORDER BY
 
 			if (round($content['last_update']) == '0') {
 				// Has never changed his accont
-				$content['last_update'] = '{--PROFILE_NEVER_CHANGED--}';
+				$content['last_update'] = '{--MEMBER_PROFILE_NEVER_CHANGED--}';
 			} else {
 				// Has changed his account
 				$content['last_update'] = generateDateTime($content['last_update'], 0);
 			}
 
 			// Load email template and send mail away
-			$message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-			sendEmail($content['email'], '{--PROFILE_OUTDATED--}', $message);
+			$message = loadEmailTemplate('member_profile', $content, bigintval($content['userid']));
+			sendEmail($content['email'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
 
 			// Update profile data
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_profile_sent`=UNIX_TIMESTAMP(), `notified`='Y' WHERE `userid`=%s LIMIT 1",
@@ -90,7 +97,7 @@ ORDER BY
 
 	// Free result
 	SQL_FREERESULT($result);
-}
+} // END - if
 
 // [EOF]
 ?>