X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_profile.php;h=1dfe8c6aed02cf30a1734dc231425ae7d802bde6;hb=626d46112349bc87ad5f64b8c16d9954144bff07;hp=dd31930b0ed36cc77cc638f0f188428153aca833;hpb=19188207e6802b82a134b340408cfa34b9b3a80f;p=mailer.git

diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index dd31930b0e..1dfe8c6aed 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -15,8 +15,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -51,17 +49,24 @@ if (!defined('__SECURITY')) {
 
 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__);
+	`userid` ASC", __FILE__, __LINE__);
 
 	// Do we have some notifications to sent?
 	if (!SQL_HASZERONUMS($result)) {
@@ -72,15 +77,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",