mailer project continued:

[mailer.git] / inc / modules / guest / what-stats.php

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 0a0c4c267a1652039baee1ec61bb33adb62b2c35..0eb2d020421833c59d3c0c1b5a5d25e1c53bd439 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 // Add description as navigation point
@@ -72,7 +72,7 @@ switch (getRequestElement('do')) {
 
        default:
                // Unsupported mode
-               debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestElement('do'))));
+               reportBug(__FILE__, __LINE__, sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestElement('do'))));
                break;
 }
 
@@ -83,8 +83,8 @@ $ltitle = '{--GUEST_STATS_' . strtoupper($lmode) . '--}';
 switch (getConfig('guest_stats')) {
        case 'MEMBERS': // Statistics about your members
                // Only males / females
-               $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', true, " AND `status`='CONFIRMED'");
-               $female = countSumTotalData('F', 'user_data', 'userid', 'gender', true, " AND `status`='CONFIRMED'");
+               $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
+               $female = countSumTotalData('F', 'user_data', 'userid', 'gender', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
 
                // List every month
                $months = array();
@@ -93,10 +93,12 @@ switch (getConfig('guest_stats')) {
                        $month = $idx;
 
                        // Append leading zero
-                       if ($idx < 10) $month = '0' . $idx;
+                       if ($idx < 10) {
+                               $month = '0' . $idx;
+                       } // END - if
 
                        // Count months
-                       $months[$month] = countSumTotalData(bigintval($month), 'user_data', 'userid', 'birth_month', true, " AND `status`='CONFIRMED'");
+                       $months[$month] = countSumTotalData(bigintval($month), 'user_data', 'userid', 'birth_month', true, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
                } // END - for
 
                // Members in categories
@@ -122,8 +124,8 @@ switch (getConfig('guest_stats')) {
                $content['unconfirmed']   = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status` != 'CONFIRMED'", __FILE__, __LINE__));
                $content['total_males']   = $male;
                $content['total_females'] = $female;
-               $content['tmem_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_TDAY?} AND `status`='CONFIRMED'", __FILE__, __LINE__));
-               $content['ymem_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_YDAY?} AND `last_online` < {?START_TDAY?} AND `status`='CONFIRMED'", __FILE__, __LINE__));
+               $content['tmem_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_TDAY?}" . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"), __FILE__, __LINE__));
+               $content['ymem_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_YDAY?} AND `last_online` < {?START_TDAY?}" . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"), __FILE__, __LINE__));
                $content['treg_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_TDAY?}", __FILE__, __LINE__));
                $content['yreg_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_YDAY?} AND `joined` < {?START_TDAY?}", __FILE__, __LINE__));
                $content['lmode']         = $lmode;
@@ -135,7 +137,7 @@ switch (getConfig('guest_stats')) {
                        if ($SW == 2) $OUT .= '<tr>';
 
                        // Prepare data for template
-                       $data = array(
+                       $row = array(
                                'l_class'  => $l,
                                'm_descr'  => $GLOBALS['month_descr'][$month],
                                'r_class'  => $r,
@@ -144,7 +146,7 @@ switch (getConfig('guest_stats')) {
                        );
 
                        // Load row template
-                       $OUT .= loadTemplate('guest_stats_month_row', true, $data);
+                       $OUT .= loadTemplate('guest_stats_month_row', true, $row);
 
                        if ($SW == 2) {
                                $r2 = '';
@@ -162,13 +164,13 @@ switch (getConfig('guest_stats')) {
                $OUT = '';
                foreach ($cat_cnt as $id => $count) {
                        // Prepare data for the template
-                       $data = array(
+                       $row = array(
                                'cat'   => $cats[$id],
                                'count' => $count,
                        );
 
                        // Load row template and switch colors
-                       $OUT .= loadTemplate('guest_stats_cats_row', true, $data);
+                       $OUT .= loadTemplate('guest_stats_cats_row', true, $row);
                } // END - foreach
                $content['cats_rows'] = $OUT;