Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / daily / daily_profile.php

diff --git a/inc/daily/daily_profile.php b/inc/daily/daily_profile.php
index b32f46c8051d02c85d13d5c2e48c58d034904581..c68794916347a996153811fc6e620ed4a38e4c06 100644 (file)
--- a/inc/daily/daily_profile.php
+++ b/inc/daily/daily_profile.php
@@ -11,14 +11,9 @@
  * Kurzbeschreibung  : Sendet Erinnerngen aus, damit die Profile        *
  *                     von den Mitgliedern aktuell gehalten werden      *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,11 +34,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || (!isDailyResetEnabled())) {
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('profile')) {
-       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
+       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-profile disabled.');
        return;
 }
 
@@ -52,7 +47,7 @@ if (!defined('__SECURITY')) {
 
 if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProfileUpdate() > 0)) {
        // Load personal data
-       $result = SQL_QUERY("SELECT
+       $result = sqlQuery("SELECT
        `userid`,
        `email`,
        `last_update`,
@@ -60,7 +55,8 @@ if ((isSendProfileUpdateEnabled()) && (getProfileUpdate() > 0) && (getResendProf
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED' AND (
+       `status`='CONFIRMED'
+       " . runFilterChain('user_exclusion_sql', ' ') . " AND (
                (
                        (UNIX_TIMESTAMP() - `last_update`) >= {?profile_update?} AND
                        `last_update` > 0 AND
@@ -74,10 +70,10 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-       // Do we have some notifications to sent?
-       if (!SQL_HASZERONUMS($result)) {
+       // Are there some notifications to sent?
+       if (!ifSqlHasZeroNumRows($result)) {
                // We need to send-out notifications...
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Translate timestamp
                        $content['joined'] = generateDateTime($content['joined'], '0');
 
@@ -94,7 +90,7 @@ ORDER BY
                        sendEmail($content['userid'], '{--MEMBER_PROFILE_OUTDATED_SUBJECT--}', $message);
 
                        // Update profile data
-                       SQL_QUERY_ESC("UPDATE
+                       sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `last_profile_sent`=UNIX_TIMESTAMP(),
@@ -107,7 +103,7 @@ LIMIT 1",
        } // END - if
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } // END - if
 
 // Debug line