- use checkbox instead of lists in users.php (Alexei)

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

4 files changed, 54 insertions, 8 deletions

diff --git a/frontends/php/config.php b/frontends/php/config.php
index 50ec4bb0..eb74da99 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -184,9 +184,9 @@
 
 	show_table2_v_delimiter($col++);
 	echo "<form name=\"selForm\" method=\"get\" action=\"config.php\">";
-	if(isset($mediatypeid))
+	if(isset($_GET["mediatypeid"]))
 	{
-		echo "<input class=\"biginput\" name=\"mediatypeid\" type=\"hidden\" value=\"$mediatypeid\" size=8>";
+		echo "<input class=\"biginput\" name=\"mediatypeid\" type=\"hidden\" value=\"".$_GET["mediatypeid"]."\" size=8>";
 	}
 
 	echo S_DESCRIPTION;
@@ -244,7 +244,7 @@
 	show_table2_v_delimiter2();
 	echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
 
-	if(isset($mediatypeid))
+	if(isset($_GET["mediatypeid"]))
 	{
 		echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update media\">";
 		echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete\" onClick=\"return Confirm('".S_DELETE_SELECTED_MEDIA."');\">";
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 0ca6b7ba..c66a2246 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -528,7 +528,7 @@
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=30>";
 
-		show_table2_v_delimiter($col++);
+/*		show_table2_v_delimiter($col++);
 		echo S_USERS;
 		show_table2_h_delimiter();
 		echo "<select multiple class=\"biginput\" name=\"users[]\" size=\"5\">";
@@ -554,7 +554,34 @@
 				echo "<option value=\"".$row["userid"]."\">".$row["alias"];
 			}
 		}
-		echo "</select>";
+		echo "</select>";*/
+
+		show_table2_v_delimiter($col++);
+		echo S_USERS;
+		show_table2_h_delimiter();
+		$result=DBselect("select distinct userid,alias from users order by alias");
+		while($row=DBfetch($result))
+		{
+			if(isset($_GET["usrgrpid"]))
+			{
+				$sql="select count(*) as count from users_groups where userid=".$row["userid"]." and usrgrpid=".$_GET["usrgrpid"];
+				$result2=DBselect($sql);
+				$row2=DBfetch($result2);
+				if($row2["count"]==0)
+				{
+					echo "<input type=checkbox name=\"".$row["userid"]."\" \">".$row["alias"];
+				}
+				else
+				{
+					echo "<input type=checkbox checked name=\"".$row["userid"]."\" \">".$row["alias"];
+				}
+			}
+			else
+			{
+				echo "<input type=checkbox name=\"".$row["userid"]."\" \">".$row["alias"];
+			}
+			echo "<br>";
+		}
 
 		show_table2_v_delimiter2();
 		echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add group\">";
diff --git a/frontends/php/media.php b/frontends/php/media.php
index 638ed9cb..edcccf64 100644
--- a/frontends/php/media.php
+++ b/frontends/php/media.php
@@ -151,7 +151,6 @@
 		$active=0;
 	}
 
-	echo "<br>";
 	show_table2_header_begin();
 	echo S_NEW_MEDIA;
 
diff --git a/frontends/php/users.php b/frontends/php/users.php
index 73547206..9d588d21 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -91,12 +91,32 @@
 		}
 		if($_GET["register"]=="add group")
 		{
-			$result=add_user_group($_GET["name"], $_GET["users"]);
+			$users=array();
+			$result=DBselect("select userid from users");
+			while($row=DBfetch($result))
+			{
+				if(isset($_GET[$row["userid"]]))
+				{
+					$users=array_merge($users,$row["userid"]);
+				}
+			}
+//			$result=add_user_group($_GET["name"], $_GET["users"]);
+			$result=add_user_group($_GET["name"], $users);
 			show_messages($result, S_GROUP_ADDED, S_CANNOT_ADD_GROUP);
 		}
 		if($_GET["register"]=="update group")
 		{
-			$result=update_user_group($_GET["usrgrpid"], $_GET["name"], $_GET["users"]);
+			$users=array();
+			$result=DBselect("select userid from users");
+			while($row=DBfetch($result))
+			{
+				if(isset($_GET[$row["userid"]]))
+				{
+					$users=array_merge($users,$row["userid"]);
+				}
+			}
+//			$result=update_user_group($_GET["usrgrpid"], $_GET["name"], $_GET["users"]);
+			$result=update_user_group($_GET["usrgrpid"], $_GET["name"], $users);
 			show_messages($result, S_GROUP_UPDATED, S_CANNOT_UPDATE_GROUP);
 		}
 		if($_GET["register"]=="delete group")