X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-stats.php;h=33f1aaed5b971c2247ba68889647a196f62c57e0;hb=20741b93fd58620af677a7f1039ffd16ea6ec689;hp=c57629a7f29bddf2a4e968968c187389d307c605;hpb=bc72f913ef9ef26f4103d3deddb4d8be5337a1e5;p=mailer.git

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index c57629a7f2..33f1aaed5b 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 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 *
@@ -42,10 +41,18 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
-// Derterminate which stats we want and set mode and title for the link below stats block
-if (!isGetRequestElementSet('mode')) setGetRequestElement('mode', strtolower(getConfig('guest_stats')));
+// This part only works if ext-user is active
+if ((!isExtensionActive('user')) && (!isAdmin())) {
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
+	return;
+} // END - if
+
+// Determine which stats we want and set mode and title for the link below stats block
+if (!isGetRequestElementSet('mode')) {
+	setGetRequestElement('mode', strtolower(getConfig('guest_stats')));
+} // END - if
 
 // Set config temporarily
 setConfigEntry('guest_stats', strtoupper(getRequestElement('mode')));
@@ -65,34 +72,20 @@ switch (getRequestElement('mode')) {
 
 	default:
 		// Unsupported mode
-		debug_report_bug(sprintf("Unsupported mode <strong>%s</strong> detected.", secureString(getRequestElement('mode'))));
+		debug_report_bug(__FILE__, __LINE__, sprintf("Unsupported mode <span class=\"data\">%s</span> detected.", secureString(getRequestElement('mode'))));
 		break;
 }
 
 // Set link title
-$ltitle = getMessage('GUEST_STATS_' . strtoupper($lmode));
+$ltitle = '{--GUEST_STATS_' . strtoupper($lmode) . '--}';
 
 // @TODO This can be rewritten in a dynamic include
 switch (getConfig('guest_stats')) {
 	case 'MEMBERS': // Statistics about your members
-		// Members yesterday / today online
-		$ymem = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= ".getConfig('START_YDAY')." AND `last_online` < ".getConfig('START_TDAY')." AND `status`='CONFIRMED'", __FILE__, __LINE__));
-		$tmem = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= ".getConfig('START_TDAY')." AND `status`='CONFIRMED'", __FILE__, __LINE__));
-
-		// Yesterday / today registered
-		$yreg = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= ".getConfig('START_YDAY')." AND `joined` < ".getConfig('START_TDAY'), __FILE__, __LINE__));
-		$treg = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= ".getConfig('START_TDAY'), __FILE__, __LINE__));
-
 		// 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'");
 
-		// Unconfirmed accounts
-		$unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status` != 'CONFIRMED'", __FILE__, __LINE__));
-
-		// Total members
-		$total = $male + $female;
-
 		// List every month
 		$months = array();
 		for ($idx = 1; $idx < 13; $idx++) {
@@ -107,7 +100,7 @@ switch (getConfig('guest_stats')) {
 		} // 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();
@@ -125,21 +118,21 @@ switch (getConfig('guest_stats')) {
 		} // END - foreach
 
 		// Prepare data for the template
-		$content['total_users']   = $total;
-		$content['unconfirmed']   = $unconfirmed;
+		$content['total_users']   = ($male + $female);
+		$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']    = $tmem;
-		$content['ymem_count']    = $ymem;
-		$content['treg_count']    = $treg;
-		$content['yreg_count']    = $yreg;
+		$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['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;
 		$content['ltitle']        = $ltitle;
 
 		// Generate monthly stats
 		$SW = 2; $r2 = ' right'; $l = 'll'; $r = 'lr'; $OUT = '';
-		foreach ($months as $month => $cnt) {
-			if ($SW == 2) $OUT .= "<tr>\n";
+		foreach ($months as $month => $count) {
+			if ($SW == 2) $OUT .= '<tr>';
 
 			// Prepare data for template
 			$data = array(
@@ -147,7 +140,7 @@ switch (getConfig('guest_stats')) {
 				'm_descr'  => $GLOBALS['month_descr'][$month],
 				'r_class'  => $r,
 				'r2_class' => $r2,
-				'cnt'      => $cnt
+				'count'    => $count
 			);
 
 			// Load row template
@@ -157,28 +150,26 @@ switch (getConfig('guest_stats')) {
 				$r2 = '';
 				$l = 'rl'; $r = 'rr';
 			} else {
-				$OUT .= "</tr>\n";
+				$OUT .= '</tr>';
 				$r2 = ' right';
 				$l = 'll'; $r = 'lr';
 			}
 			$SW = 3 - $SW;
-		}
+		} // END - foreach
 		$content['month_rows'] = $OUT;
 
 		// Generate category stats
-		$OUT = ''; $SW = 2;
-		foreach ($cat_cnt as $id => $cnt) {
+		$OUT = '';
+		foreach ($cat_cnt as $id => $count) {
 			// Prepare data for the template
 			$data = array(
-				'sw'  => $SW,
-				'cat' => $cats[$id],
-				'cnt' => $cnt,
+				'cat'   => $cats[$id],
+				'count' => $count,
 			);
 
 			// Load row template and switch colors
 			$OUT .= loadTemplate('guest_stats_cats_row', true, $data);
-			$SW = 3 - $SW;
-		}
+		} // END - foreach
 		$content['cats_rows'] = $OUT;
 
 		// Load final template
@@ -191,37 +182,29 @@ 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_NUMROWS($guest_t10) > 0) {
+		if (!SQL_HASZERONUMS($guest_t10)) {
 			// Guest clicks
-			$OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_GUEST_STATS'));
-			$SW = 2;
+			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
 			while ($content = SQL_FETCHARRAY($guest_t10)) {
-				$content['sw'] = $SW;
-
 				// Load row template
 				$OUT .= loadTemplate('guest_stats_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - while
 		} // END - if
 
-		if (SQL_NUMROWS($mem_t10) > 0) {
+		if (!SQL_HASZERONUMS($mem_t10)) {
 			// Member clicks
-			$OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_MEMBER_STATS'));
-			$SW = 2;
+			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
 			while ($content = SQL_FETCHARRAY($mem_t10)) {
-				$content['sw'] = $SW;
-
 				// Load row template
 				$OUT .= loadTemplate('guest_stats_row', true, $content);
-				$SW = 3 - $SW;
 			} // END - while
 		} // END - if
 
-		if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {
+		if ((!SQL_HASZERONUMS($guest_t10)) || (!SQL_HASZERONUMS($mem_t10))) {
 			// Prepare content
 			$content = array(
 				'rows'   => $OUT,
@@ -233,14 +216,14 @@ switch (getConfig('guest_stats')) {
 			loadTemplate('guest_stats_table', false, $content);
 		} else {
 			// No clicks detected
-			loadTemplate('admin_settings_saved', false, getMessage('GUEST_STATS_NO_CLICKS'));
+			displayMessage('{--GUEST_STATS_NO_CLICKS--}');
 		}
 		break;
 
 	case 'INACTIVE': // Deactivated stats
-		loadTemplate('admin_settings_saved', false, getMessage('GUEST_STATS_DEACTIVATED'));
+		displayMessage('{--GUEST_STATS_DEACTIVATED--}');
 		break;
-}
+} // END - switch
 
 // [EOF]
 ?>