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

[mailer.git] / inc / pool / pool-user.php

diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php
index 74c30040bb9c296ef07e2746f31608d02af47189..128d793eea663d566c30dfa225e20f7bab524949 100644 (file)
--- a/inc/pool/pool-user.php
+++ b/inc/pool/pool-user.php
@@ -16,7 +16,7 @@
  * $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 *
@@ -84,7 +84,7 @@ $lastSentId = '0';
 $count_back = array(0);
 $pointsBack = array(0);
 
-if (!ifSqlHasZeroNums($result_main)) {
+if (!ifSqlHasZeroNumRows($result_main)) {
        // Parse all mails
        while ($mailData = sqlFetchArray($result_main)) {
                // Set mail order as 'active'. That means it will be sent out
@@ -115,15 +115,15 @@ if (!ifSqlHasZeroNums($result_main)) {
                        // We can now send mails to them...
                        foreach ($receivers as $key => $userid) {
                                // Lookup user id
-                               //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.SQL_NUMROWS($result_user).'*');
+                               //* DEBUG: */ debugOutput('*L:'.__LINE__.'/'.sqlNumRows($result_user).'*');
                                if (fetchUserData($userid)) {
                                        // Is there a stats entry?
                                        $result_stats = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s AND `userid`=%s AND timestamp_ordered='%s' LIMIT 1",
                                                array($mailData['id'], $mailData['sender_userid'], $mailData['timestamp']), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
-                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
-                                       if (ifSqlHasZeroNums($result_stats)) {
+                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
+                                       if (ifSqlHasZeroNumRows($result_stats)) {
                                                // No entry was found, so we add him!
                                                sqlQueryEscaped("INSERT INTO
        `{?_MYSQL_PREFIX?}_user_stats`
@@ -164,7 +164,7 @@ if (!ifSqlHasZeroNums($result_main)) {
                                                        array(bigintval($mailData['id']), bigintval($mailData['sender_userid']), bigintval($mailData['timestamp'])), __FILE__, __LINE__);
                                        } // END - if
 
-                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.SQL_NUMROWS($result_stats).'!');
+                                       //* DEBUG: */ debugOutput('!L:'.__LINE__.'/'.sqlNumRows($result_stats).'!');
                                        if (sqlNumRows($result_stats) == 1) {
                                                // We got one!
                                                list($stats_id) = sqlFetchRow($result_stats);
@@ -306,7 +306,7 @@ if (!ifSqlHasZeroNums($result_main)) {
        } // END - while
 
        // Is there points to "pay back"?
-       if ((count($pointsBack) > 0) && (!empty($pointsBack[0]))) {
+       if ((isFilledArray($pointsBack)) && (!empty($pointsBack[0]))) {
                // Walk through all points
                foreach ($pointsBack as $userid => $PB) {
                        // Add points only when we have points left to add and a valid user id