- added support for Inverse Select in status of triggers (Alexei)

 - added support for flexible permissions (Alexei)


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

1 files changed, 83 insertions, 2 deletions

diff --git a/frontends/php/users.php b/frontends/php/users.php
index aa5763f3..4299e439 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -6,6 +6,15 @@
 	show_header($page["title"],0,0);
 ?>
 
+<?
+        if(!check_right("User","R",0))
+        {
+                show_table_header("<font color=\"AA0000\">No permissions !</font
+>");
+                show_footer();
+                exit;
+        }
+?>
 
 <?
 	if(isset($register))
@@ -28,6 +37,17 @@
 			show_messages($result, "User successfully deleted", "Cannot delete user");
 			unset($userid);
 		}
+		if($register=="delete_permission")
+		{
+			$result=delete_permission($rightid);
+			show_messages($result, "Permission successfully deleted", "Cannot delete permission");
+			unset($rightid);
+		}
+		if($register=="add permission")
+		{
+			$result=add_permission($userid,$right,$permission,$id);
+			show_messages($result, "Permission successfully added", "Cannot add permission");
+		}
 		if($register=="update")
 		{
 			if($password1==$password2)
@@ -51,7 +71,8 @@
 <?
 	show_table_header("USERS");
 	echo "<TABLE BORDER=0 COLS=4 WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-	echo "<TR><TD WIDTH=\"10%\"><B>Group</B></TD>";
+	echo "<TR><TD WIDTH=\"3%\"><B>Id</B></TD>";
+	echo "<TD WIDTH=\"10%\"><B>Group</B></TD>";
 	echo "<TD WIDTH=\"10%\"><B>Alias</B></TD>";
 	echo "<TD WIDTH=\"10%\" NOSAVE><B>Name</B></TD>";
 	echo "<TD WIDTH=\"10%\" NOSAVE><B>Surname</B></TD>";
@@ -66,11 +87,19 @@
 		if($col++%2==0)	{ echo "<TR BGCOLOR=#EEEEEE>"; }
 		else		{ echo "<TR BGCOLOR=#DDDDDD>"; }
 	
+		echo "<TD>".$row["userid"]."</TD>";
 		echo "<TD>".$row["grp"]."</TD>";
 		echo "<TD>".$row["alias"]."</TD>";
 		echo "<TD>".$row["name"]."</TD>";
 		echo "<TD>".$row["surname"]."</TD>";
-		echo "<TD><A HREF=\"users.php?register=change&userid=".$row["userid"]."\">Change</A> - <A HREF=\"media.php?userid=".$row["userid"]."\">Media</A>";
+        	if(check_right("User","U",$row["userid"]))
+		{
+			echo "<TD><A HREF=\"users.php?register=change&userid=".$row["userid"]."\">Change</A> - <A HREF=\"media.php?userid=".$row["userid"]."\">Media</A>";
+		}
+		else
+		{
+			echo "<TD>Change - Media";
+		}
 		echo "</TD>";
 		echo "</TR>";
 	}
@@ -78,6 +107,58 @@
 ?>
 
 <?
+	if(isset($userid))
+	{
+
+	echo "<br>";
+	show_table_header("USER PERMISSIONS");
+	echo "<TABLE BORDER=0 COLS=4 WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
+	echo "<TR><TD WIDTH=\"10%\"><B>Permission</B></TD>";
+	echo "<TD WIDTH=\"10%\"><B>Right</B></TD>";
+	echo "<TD WIDTH=\"10%\" NOSAVE><B>Resource name</B></TD>";
+	echo "<TD WIDTH=\"10%\" NOSAVE><B>Actions</B></TD>";
+	echo "</TR>";
+	$result=DBselect("select rightid,name,permission,id from rights where userid=$userid order by name,permission,id");
+	echo "<CENTER>";
+	$col=0;
+	while($row=DBfetch($result))
+	{
+//        	if(!check_right("User","R",$row["userid"]))
+//		{
+//			continue;
+//		}
+		if($col++%2==0)	{ echo "<TR BGCOLOR=#EEEEEE>"; }
+		else		{ echo "<TR BGCOLOR=#DDDDDD>"; }
+	
+		echo "<TD>".$row["name"]."</TD>";
+		if($row["permission"]=="R")
+		{
+			echo "<TD>Read only</TD>";
+		}
+		else if($row["permission"]=="U")
+		{
+			echo "<TD>Read-write</TD>";
+		}
+		else if($row["permission"]=="H")
+		{
+			echo "<TD>Hide</TD>";
+		}
+		else
+		{
+			echo "<TD>".$row["permission"]."</TD>";
+		}
+		echo "<TD>".get_resource_name($row["name"],$row["id"])."</TD>";
+		echo "<TD><A HREF=users.php?userid=$userid&rightid=".$row["rightid"]."&register=delete_permission>Delete</A></TD>";
+	}
+	echo "</TR>";
+	echo "</TABLE>";
+
+	insert_permissions_form($userid);
+
+	}
+?>
+
+<?
 	echo "<br>";
 
 	@insert_user_form($userid);