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

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

diff --git a/inc/daily/daily_user.php b/inc/daily/daily_user.php
index 4979448bd9682fb94b13d49606aeff3d3509781c..e09ff4213f5163857b0b97666df4f9ec39157036 100644 (file)
--- a/inc/daily/daily_user.php
+++ b/inc/daily/daily_user.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * 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 *
@@ -52,7 +47,7 @@ if (!defined('__SECURITY')) {
 // Update user profiles
 if (isExtensionInstalledAndNewer('order', '0.1.1')) {
        // Latest version
-       SQL_QUERY('UPDATE
+       sqlQuery('UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `receive_mails`=`max_mails`,
@@ -62,7 +57,7 @@ WHERE
        ' . runFilterChain('user_exclusion_sql', ' ') . '', __FILE__, __LINE__);
 } else {
        // Obsolete version
-       SQL_QUERY('UPDATE
+       sqlQuery('UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `receive_mails`=`max_mails`
@@ -72,7 +67,7 @@ WHERE
 }
 
 // Transfer points from locked_points to points
-$result_daily = SQL_QUERY("SELECT
+$result_daily = sqlQuery("SELECT
        `userid`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
@@ -83,17 +78,17 @@ WHERE
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
 
-//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . SQL_NUMROWS($result_daily));
-if (!SQL_HASZERONUMS($result_daily)) {
+//* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;daily|numRows=' . sqlNumRows($result_daily));
+if (!ifSqlHasZeroNumRows($result_daily)) {
        // Init SQLs
        initSqls();
 
        // Run through all 'locked_(foo)_points columsn
        foreach (runFilterChain('locked_points_columns_array', array('points')) as $columnName) {
                // Start checking accounts which are on 0 confirmed-to-go mails
-               while ($content = SQL_FETCHARRAY($result_daily)) {
+               while ($content = sqlFetchArray($result_daily)) {
                        //* DEBUG: */ debugOutput(basename(__FILE__) . ':' . $content['userid']);
-                       $result_points = SQL_QUERY_ESC("SELECT
+                       $result_points = sqlQueryEscaped("SELECT
        `ref_depth`,
        `locked_%s`
 FROM
@@ -109,17 +104,17 @@ ORDER BY
                                        $columnName
                                ), __FILE__, __LINE__);
 
-                       //* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . SQL_NUMROWS($result_points));
-                       if (!SQL_HASZERONUMS($result_points)) {
+                       //* DEBUG: */ debugOutput(basename(__FILE__) . ':payout=0;points|numRows=' . sqlNumRows($result_points));
+                       if (!ifSqlHasZeroNumRows($result_points)) {
                                // Ok transfer points
-                               while ($content2 = SQL_FETCHARRAY($result_points)) {
+                               while ($content2 = sqlFetchArray($result_points)) {
                                        // Merge both arrays
                                        $content = merge_array($content, $content2);
 
                                        //* DEBUG: */ debugOutput(basename(__FILE__) . ':userid=' . $content['userid'].',depth='.$content['ref_depth'].',columnName=' . $columnName . ',locked='.$content['locked_' . $columnName]);
                                        if ($content['ref_depth'] > 0) {
                                                // Level 1+
-                                               addSql(SQL_QUERY_ESC("UPDATE
+                                               addSql(sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_points`
 SET
        `%s`=`%s`+%s,
@@ -139,7 +134,7 @@ LIMIT 1",
                                                );
                                        } else {
                                                // Level zero
-                                               addSql(SQL_QUERY_ESC("UPDATE
+                                               addSql(sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_points`
 SET
        `%s`=`%s`+%s,
@@ -167,7 +162,7 @@ LIMIT 1",
                        } // END - if
 
                        // Free memory
-                       SQL_FREERESULT($result_points);
+                       sqlFreeResult($result_points);
                } // END - while
        } // END - foreach
 
@@ -176,7 +171,7 @@ LIMIT 1",
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_daily);
+sqlFreeResult($result_daily);
 
 // Debug line
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.');