X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-stats.php;h=86ba162d24539a53e5c969b1da5b62d4ac1264e1;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hp=552fa76c3512c5a694723d5dbad156333ac8c0c6;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;p=mailer.git
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 552fa76c35..86ba162d24 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -10,13 +10,8 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Statistiken *
* -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $Date:: $ *
- * $Tag:: 0.2.1-FINAL $ *
- * $Author:: $ *
- * -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 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 *
@@ -49,42 +44,43 @@ 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 %s detected.", secureString(getRequestElement('do'))));
+ reportBug(__FILE__, __LINE__, sprintf('Unsupported mode %s detected.', sqlEscapeString($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'"));
- $female = countSumTotalData('F', 'user_data', 'userid', 'gender', true, runFilterChain('user_exclusion_sql', " 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();
@@ -98,36 +94,37 @@ switch (getConfig('guest_stats')) {
} // END - if
// Count months
- $months[$month] = countSumTotalData(bigintval($month), 'user_data', 'userid', 'birth_month', true, runFilterChain('user_exclusion_sql', " 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 = sqlQuery("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `visible`='Y' ORDER BY `id` ASC", __FILE__, __LINE__);
// Load categories first
$cats = array(); $cat_cnt = array();
// @TODO This can be somehow rewritten
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($content = sqlFetchArray($result)) {
// Simple...
$cats[$content['id']] = $content['cat'];
} // END - while
- // Now we have all categories loaded, count members
+ // Now all categories have been loaded, count members
foreach ($cats as $id => $dummy) {
- // We only need id and nothing more to count...
- $cat_cnt[$id] = countSumTotalData(bigintval($id), 'user_cats', 'id', 'cat_id', true);
+ // Only the id needs to be counted
+ // @TODO This doesn't exclude tester accounts
+ $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'] = sqlNumRows(sqlQuery("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['tmem_count'] = sqlNumRows(sqlQuery("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_TDAY?}" . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'"), __FILE__, __LINE__));
+ $content['ymem_count'] = sqlNumRows(sqlQuery("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'] = sqlNumRows(sqlQuery("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_TDAY?}" . runFilterChain('user_exclusion_sql', ' '), __FILE__, __LINE__));
+ $content['yreg_count'] = sqlNumRows(sqlQuery("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;
@@ -146,7 +143,7 @@ switch (getConfig('guest_stats')) {
);
// Load row template
- $OUT .= loadTemplate('guest_stats_month_row', true, $row);
+ $OUT .= loadTemplate('guest_stats_month_row', TRUE, $row);
if ($SW == 2) {
$r2 = '';
@@ -170,12 +167,12 @@ switch (getConfig('guest_stats')) {
);
// Load row template and switch colors
- $OUT .= loadTemplate('guest_stats_cats_row', true, $row);
+ $OUT .= loadTemplate('guest_stats_cats_row', TRUE, $row);
} // END - foreach
$content['cats_rows'] = $OUT;
// Load final template
- loadTemplate('guest_stats_member', false, $content);
+ loadTemplate('guest_stats_member', FALSE, $content);
break;
case 'MODULES': // TOP10 module clicks
@@ -184,29 +181,30 @@ 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__);
- $OUT = '';
+ $guest_t10 = sqlQuery('SELECT `counter`, `title` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `counter` > 0' . $AND . ' ORDER BY `counter` DESC LIMIT 0,10', __FILE__, __LINE__);
+ $mem_t10 = sqlQuery('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)) {
+ if (!ifSqlHasZeroNums($guest_t10)) {
// Guest clicks
- $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
- while ($content = SQL_FETCHARRAY($guest_t10)) {
+ $OUT .= loadTemplate('guest_stats_header', TRUE, '{--GUEST_TOP_GUEST_STATS--}');
+ while ($content = sqlFetchArray($guest_t10)) {
// Load row template
- $OUT .= loadTemplate('guest_stats_row', true, $content);
+ $OUT .= loadTemplate('guest_stats_row', TRUE, $content);
} // END - while
} // END - if
- if (!SQL_HASZERONUMS($mem_t10)) {
+ if (!ifSqlHasZeroNums($mem_t10)) {
// Member clicks
- $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
- while ($content = SQL_FETCHARRAY($mem_t10)) {
+ $OUT .= loadTemplate('guest_stats_header', TRUE, '{--GUEST_TOP_MEMBER_STATS--}');
+ while ($content = sqlFetchArray($mem_t10)) {
// Load row template
- $OUT .= loadTemplate('guest_stats_row', true, $content);
+ $OUT .= loadTemplate('guest_stats_row', TRUE, $content);
} // 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,
@@ -215,7 +213,7 @@ switch (getConfig('guest_stats')) {
);
// Load final template
- loadTemplate('guest_stats_table', false, $content);
+ loadTemplate('guest_stats_table', FALSE, $content);
} else {
// No clicks detected
displayMessage('{--GUEST_STATS_NO_CLICKS--}');