X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-stats.php;h=0eb2d020421833c59d3c0c1b5a5d25e1c53bd439;hb=ca11996eb52fa0a1ec45d6ab10f5331c4a54a116;hp=c5c6b87db61b42c81ba46c73876c75eb49679730;hpb=af7e2ca186ae88d343f90bcb753645ab4847f227;p=mailer.git
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index c5c6b87db6..0eb2d02042 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * 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 *
* it under the terms of the GNU General Public License as published by *
@@ -37,7 +37,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- die();
+ exit();
} // END - if
// Add description as navigation point
@@ -50,14 +50,14 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
} // END - if
// Determine which stats we want and set mode and title for the link below stats block
-if (!isGetRequestParameterSet('mode')) {
- setGetRequestParameter('mode', strtolower(getConfig('guest_stats')));
+if (!isGetRequestElementSet('do')) {
+ setGetRequestElement('do', strtolower(getConfig('guest_stats')));
} // END - if
// Set config temporarily
-setConfigEntry('guest_stats', strtoupper(getRequestParameter('mode')));
+setConfigEntry('guest_stats', strtoupper(getRequestElement('do')));
-switch (getRequestParameter('mode')) {
+switch (getRequestElement('do')) {
case 'members' :
$lmode = 'modules';
break;
@@ -72,7 +72,7 @@ switch (getRequestParameter('mode')) {
default:
// Unsupported mode
- debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode %s detected.", secureString(getRequestParameter('mode'))));
+ reportBug(__FILE__, __LINE__, sprintf("Unsupported mode %s 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,14 +93,16 @@ 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
- $result = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `visible`='Y' ORDER BY `id` ASC", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `visible`='Y' ORDER BY `id` ASC", __FILE__, __LINE__);
// Load categories first
$cats = array(); $cat_cnt = array();
@@ -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 .= '';
// 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;
@@ -182,8 +184,8 @@ switch (getConfig('guest_stats')) {
if (isAdmin()) $AND = '';
// Query for guest and member menus
- $guest_t10 = SQL_QUERY('SELECT `counter`, `title` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `counter` > 0' . $AND . ' ORDER BY `counter` DESC LIMIT 0,10', __FILE__, __LINE__);
- $mem_t10 = SQL_QUERY('SELECT `counter`, `title` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `counter` > 0' . $AND . ' ORDER BY `counter` DESC LIMIT 0,10', __FILE__, __LINE__);
+ $guest_t10 = SQL_QUERY('SELECT `counter`,`title` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `counter` > 0' . $AND . ' ORDER BY `counter` DESC LIMIT 0,10', __FILE__, __LINE__);
+ $mem_t10 = SQL_QUERY('SELECT `counter`,`title` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `counter` > 0' . $AND . ' ORDER BY `counter` DESC LIMIT 0,10', __FILE__, __LINE__);
$OUT = '';
if (!SQL_HASZERONUMS($guest_t10)) {