Filters for configurable userid exclusion added:

[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 81acf6ecdff4d084e6590da34d7efe93eab435bb..9ee6c440869e07ab0bfc8a533d954edb17d5e4c2 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -49,38 +49,39 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
        return;
 } // END - if
 
-// Determine which stats we want and set mode and title for the link below stats block
-if (!isGetRequestElementSet('do')) {
-       setGetRequestElement('do', strtolower(getConfig('guest_stats')));
-} // END - if
+// Default mode is from config
+$do = getConfig('guest_stats');
 
-// Set config temporarily
-setConfigEntry('guest_stats', strtoupper(getRequestElement('do')));
+// Determine which stats are wanted and set mode and title for the link below stats block
+if (isGetRequestElementSet('do')) {
+       // Use it from get value
+       $do = strtoupper(getRequestElement('do'));
+} // END - if
 
-switch (getRequestElement('do')) {
-       case 'members' :
-               $lmode = 'modules';
+switch ($do) {
+       case 'MEMBERS' :
+               $lmode = 'MODULES';
                break;
 
-       case 'modules' :
-               $lmode = 'members';
+       case 'MODULES' :
+               $lmode = 'MEMBERS';
                break;
 
-       case 'inactive':
-               $lmode = 'inactive';
+       case 'INACTIVE':
+               $lmode = 'INACTIVE';
                break;
 
        default:
                // Unsupported mode
-               reportBug(__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.", SQL_ESCAPE($do)));
                break;
-}
+} // END - switch
 
 // Set link title
-$ltitle = '{--GUEST_STATS_' . strtoupper($lmode) . '--}';
+$ltitle = '{--GUEST_STATS_' . $lmode . '--}';
 
 // @TODO This can be rewritten in a dynamic include
-switch (getConfig('guest_stats')) {
+switch (strtoupper($do)) {
        case 'MEMBERS': // Statistics about your members
                // Only males / females
                $male   = countSumTotalData('M', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"));
@@ -116,18 +117,19 @@ switch (getConfig('guest_stats')) {
                // Now we have all categories loaded, count members
                foreach ($cats as $id => $dummy) {
                        // We only need id and nothing more to count...
+                       // @TODO This does not exclude testers
                        $cat_cnt[$id] = countSumTotalData(bigintval($id), 'user_cats', 'id', 'cat_id', TRUE);
                } // END - foreach
 
                // Prepare data for the template
                $content['total_users']   = ($male + $female);
-               $content['unconfirmed']   = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status` != 'CONFIRMED'", __FILE__, __LINE__));
+               $content['unconfirmed']   = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status` != 'CONFIRMED'" . runFilterChain('user_exclusion_sql', ' '), __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?}" . 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['treg_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_TDAY?}" . runFilterChain('user_exclusion_sql', ' '), __FILE__, __LINE__));
+               $content['yreg_count']    = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_YDAY?} AND `joined` < {?START_TDAY?}" . runFilterChain('user_exclusion_sql', ' '), __FILE__, __LINE__));
                $content['lmode']         = $lmode;
                $content['ltitle']        = $ltitle;
 
@@ -206,7 +208,8 @@ switch (getConfig('guest_stats')) {
                        } // END - while
                } // END - if
 
-               if ((!SQL_HASZERONUMS($guest_t10)) || (!SQL_HASZERONUMS($mem_t10))) {
+               // Is something generated?
+               if (!empty($OUT)) {
                        // Prepare content
                        $content = array(
                                'rows'   => $OUT,