- added support for real delta. item.delta=2. (Alexei)

 - new selection for triggers.php (Alexei)
 - new selection for items.php (Alexei)
 - removed helpdesk.php (Alexei)
 - fixed check of permissions for screenedit.php (Alexei)
 - new selection for graphs in charts.php (Alexei)
 - new selection of maps in maps.php (Alexei)
 - new selection of group and host for latest.php (Alexei)
 - added support for macro {IPADDRESS} (Alexei)


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

1 files changed, 7 insertions, 11 deletions

diff --git a/frontends/php/users.php b/frontends/php/users.php
index 3448d71d..035b6cc3 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -19,11 +19,12 @@
 **/
 ?>
 <?php
+	include "include/config.inc.php";
+	include "include/forms.inc.php";
+
 	$page["title"] = S_USERS;
 	$page["file"] = "users.php";
 
-	include "include/config.inc.php";
-	include "include/forms.inc.php";
 	show_header($page["title"],0,0);
 	insert_confirm_javascript();
 ?>
@@ -184,14 +185,9 @@
 		$sql="select count(*) as count from sessions where userid=".$row["userid"]." and lastaccess-600<".time();
 		$result2=DBselect($sql);
 		$row2=DBfetch($result2);
-		if($row2["count"]>0)
-		{
-			echo "<TD><font color=\"00AA00\">".S_YES."</font></TD>";
-		}
-		else
-		{
-			echo "<TD><font color=\"AA0000\">".S_NO."</font></TD>";
-		}
+		iif_echo($row2["count"]>0,
+			"<TD><font color=\"00AA00\">".S_YES."</font></TD>",
+			"<TD><font color=\"AA0000\">".S_NO."</font></TD>");
 		echo "<TD>";
         	if(check_right("User","U",$row["userid"]))
 		{
@@ -206,7 +202,7 @@
 		}
 		else
 		{
-			echo S_CHANGE." - ".S_MEDIA";
+			echo S_CHANGE." - ".S_MEDIA;
 		}
 		echo "</TD>";
 		echo "</TR>";