mailer project continued:

[mailer.git] / inc / filter / earning_filter.php

diff --git a/inc/filter/earning_filter.php b/inc/filter/earning_filter.php
index 8efff96a8ceb0378ddb6322eef8f42e6bd234c75..4f290e70db897ebcc1b1c681013d76a6af599788 100644 (file)
--- a/inc/filter/earning_filter.php
+++ b/inc/filter/earning_filter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,7 +46,7 @@ function FILTER_ADD_EARNING_GROUP_POPUP ($filterData) {
        // Check if the current userid is same as in $filterData
        if (getMemberId() != $filterData['userid']) {
                // Not the same
-               debug_report_bug(__FUNCTION__, __LINE__, 'Validation of userid failed. ' . getMemberId() . '!=' . $filterData['userid']);
+               reportBug(__FUNCTION__, __LINE__, 'Validation of userid failed. ' . getMemberId() . '!=' . $filterData['userid']);
        } // END - if
 
        // Now check if the user has subscription and amount left
@@ -54,7 +54,11 @@ function FILTER_ADD_EARNING_GROUP_POPUP ($filterData) {
        d.`earning_id`,
        d.`earning_provider`,
        u.`earning_current_amount`,
-       u.`earning_daily_amount`
+       u.`earning_daily_amount`,
+       u.`earning_active`,
+       u.`earning_added`,
+       u.`earning_canceled`,
+       u.`earning_points`
 FROM
        `{?_MYSQL_PREFIX?}_user_earning` AS u
 INNER JOIN
@@ -73,7 +77,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Do we have entries left?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Load all names
                while ($content = SQL_FETCHARRAY($result)) {
                        // Merge the $filterData array in
@@ -82,7 +86,11 @@ ORDER BY
                        // Construct callback function name
                        $callbackName = 'get' . capitalizeUnderscoreString($content['earning_provider']) . 'DataByEarningArray';
 
-                       // And call it
+                       /*
+                        * And call it, the called function should NOT write data in
+                        * '__output'. This however is done here in this function. The
+                        * called function shall ALWAYS put it's data in '__data'.
+                        */
                        $content = call_user_func($callbackName, $content);
                } // END - if
        } // END - if