- improved media maintenance form (Alexei)

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

2 files changed, 17 insertions, 3 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 3ea0c63d..e11ba5c9 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2659,7 +2659,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 
 	# Add Media definition
 
-	function	add_media( $userid, $mediatypeid, $sendto, $severity)
+	function	add_media( $userid, $mediatypeid, $sendto, $severity, $active)
 	{
 		$c=count($severity);
 		$s=0;
@@ -2667,7 +2667,21 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 		{
 			$s=$s|pow(2,(int)$severity[$i]);
 		}
-		$sql="insert into media (userid,mediatypeid,sendto,active,severity) values ($userid,'$mediatypeid','$sendto',0,$s)";
+		$sql="insert into media (userid,mediatypeid,sendto,active,severity) values ($userid,'$mediatypeid','$sendto',$active,$s)";
+		return	DBexecute($sql);
+	}
+
+	# Update Media definition
+
+	function	update_media($mediaid, $userid, $mediatypeid, $sendto, $severity, $active)
+	{
+		$c=count($severity);
+		$s=0;
+		for($i=0;$i<$c;$i++)
+		{
+			$s=$s|pow(2,(int)$severity[$i]);
+		}
+		$sql="update media set userid=$userid, mediatypeid=$mediatypeid, sendto='$sendto', active=$active,severity=$s where mediaid=$mediaid";
 		return	DBexecute($sql);
 	}
 
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index 8db44c9f..6cec7925 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -70,7 +70,7 @@
 		if($DB_TYPE == "MYSQL")
 		{
 			$result=mysql_query($query,$DB);
-#
+
 			if(!$result)
 			{
 				echo "ERROR EXECUTING: $query<br>";