X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-stats.php;h=31a56e8b31be7368d55a639140f518ff0b39d6ca;hp=38ea6bbf473a8d561e7d32bb0f2daf5d3be44e3c;hb=682edce003a1a91f66fb8e2212d7fdb591379843;hpb=cf3765c38cf0a76f396aca291f71858936e92956

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 38ea6bbf47..31a56e8b31 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -14,8 +14,6 @@
  * $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                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -76,24 +74,10 @@ $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` >= {?START_YDAY?} AND `last_online` < {?START_TDAY?} AND `status`='CONFIRMED'", __FILE__, __LINE__));
-		$tmem = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `last_online` >= {?START_TDAY?} AND `status`='CONFIRMED'", __FILE__, __LINE__));
-
-		// Yesterday / today registered
-		$yreg = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?START_YDAY?} AND `joined` < {?START_TDAY?}", __FILE__, __LINE__));
-		$treg = SQL_NUMROWS(SQL_QUERY("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `joined` >= {?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++) {
@@ -126,21 +110,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(
@@ -148,7 +132,7 @@ switch (getConfig('guest_stats')) {
 				'm_descr'  => $GLOBALS['month_descr'][$month],
 				'r_class'  => $r,
 				'r2_class' => $r2,
-				'cnt'      => $cnt
+				'cnt'      => $count
 			);
 
 			// Load row template
@@ -158,7 +142,7 @@ switch (getConfig('guest_stats')) {
 				$r2 = '';
 				$l = 'rl'; $r = 'rr';
 			} else {
-				$OUT .= "</tr>\n";
+				$OUT .= '</tr>';
 				$r2 = ' right';
 				$l = 'll'; $r = 'lr';
 			}
@@ -168,11 +152,11 @@ switch (getConfig('guest_stats')) {
 
 		// Generate category stats
 		$OUT = '';
-		foreach ($cat_cnt as $id => $cnt) {
+		foreach ($cat_cnt as $id => $count) {
 			// Prepare data for the template
 			$data = array(
 				'cat' => $cats[$id],
-				'cnt' => $cnt,
+				'cnt' => $count,
 			);
 
 			// Load row template and switch colors
@@ -190,11 +174,11 @@ 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, '{--GUEST_TOP_GUEST_STATS--}');
 			while ($content = SQL_FETCHARRAY($guest_t10)) {
@@ -203,7 +187,7 @@ switch (getConfig('guest_stats')) {
 			} // END - while
 		} // END - if
 
-		if (SQL_NUMROWS($mem_t10) > 0) {
+		if (!SQL_HASZERONUMS($mem_t10)) {
 			// Member clicks
 			$OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
 			while ($content = SQL_FETCHARRAY($mem_t10)) {
@@ -212,7 +196,7 @@ switch (getConfig('guest_stats')) {
 			} // 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,