- added severity to media definition (Alexei)

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

2 files changed, 21 insertions, 3 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 3b3114b2..6b041914 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2526,9 +2526,15 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 
 	# Add Media definition
 
-	function	add_media( $userid, $mediatypeid, $sendto)
+	function	add_media( $userid, $mediatypeid, $sendto, $severity)
 	{
-		$sql="insert into media (userid,mediatypeid,sendto,active) values ($userid,'$mediatypeid','$sendto',0)";
+		$c=count($severity);
+		$s=0;
+		for($i=0;$i<$c;$i++)
+		{
+			$s=$s|pow(2,(int)$severity[$i]);
+		}
+		$sql="insert into media (userid,mediatypeid,sendto,active,severity) values ($userid,'$mediatypeid','$sendto',0,$s)";
 		return	DBexecute($sql);
 	}
 
diff --git a/frontends/php/media.php b/frontends/php/media.php
index 3aa472ff..3e5f9986 100644
--- a/frontends/php/media.php
+++ b/frontends/php/media.php
@@ -32,7 +32,7 @@
 		}
 		elseif($HTTP_GET_VARS["register"]=="add")
 		{
-			$result=add_media( $HTTP_GET_VARS["userid"], $HTTP_GET_VARS["mediatypeid"], $HTTP_GET_VARS["sendto"]);
+			$result=add_media( $HTTP_GET_VARS["userid"], $HTTP_GET_VARS["mediatypeid"], $HTTP_GET_VARS["sendto"],$HTTP_GET_VARS["severity"]);
 			show_messages($result,"Media added","Cannot add media");
 		}
 		elseif($HTTP_GET_VARS["register"]=="delete")
@@ -124,6 +124,18 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"sendto\" size=20>";
 
+	show_table2_v_delimiter();
+	echo "Use if";
+	show_table2_h_delimiter();
+	echo "<select multiple class=\"biginput\" name=\"severity[]\" size=\"5\">";
+	echo "<option value=\"0\" selected>Not classified";
+	echo "<option value=\"1\" selected>Information";
+	echo "<option value=\"2\" selected>Warning";
+	echo "<option value=\"3\" selected>Average";
+	echo "<option value=\"4\" selected>High";
+	echo "<option value=\"5\" selected>Disaster";
+	echo "</select>";
+
 	show_table2_v_delimiter2();
 	echo "<input type=\"submit\" name=\"register\" value=\"add\">";