- [DEV-171] improvements to escalation form (Artem)

 - [DEV-137] small fixes (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5778 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 3 insertions, 3 deletions

diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index e8ce905c..a63dce73 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -374,11 +374,11 @@ function make_status_of_zbx(){
 	$table->AddRow(array(S_NUMBER_OF_ALERTS,$status['alerts_count'],' - '));*/
 
 //Log Out 10min	
-	$sql = 'SELECT DISTINCT u.userid, MAX(s.lastaccess) as lastaccess, u.autologout '.
+	$sql = 'SELECT DISTINCT u.userid, MAX(s.lastaccess) as lastaccess, u.autologout, s.status '.
 			' FROM users u '.
 				' LEFT JOIN sessions s ON s.userid=u.userid'.
 			' WHERE '.DBin_node('u.userid').
-			' GROUP BY u.userid,u.autologout';
+			' GROUP BY u.userid';
 
 	$db_users = DBSelect($sql);
 	
@@ -386,7 +386,7 @@ function make_status_of_zbx(){
 	$online_cnt = 0;
 	while($user=DBFetch($db_users)){
 		$online_time = (($user['autologout'] == 0) || (ZBX_USER_ONLINE_TIME<$user['autologout']))?ZBX_USER_ONLINE_TIME:$user['autologout'];
-		if(!is_null($user['lastaccess']) && (($user['lastaccess']+$online_time)>=time())) $online_cnt++;
+		if(!is_null($user['lastaccess']) && (($user['lastaccess']+$online_time)>=time()) && (ZBX_SESSION_ACTIVE == $user['status'])) $online_cnt++;
 		$usr_cnt++;
 	}