summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2002-08-25 14:24:41 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2002-08-25 14:24:41 +0000
commit5784b2fcc28da70b6fd6900a711b9c2265cca181 (patch)
treed6aee57b35abb0cf1e442b1eb5b0fb14d1cf6df3 /frontends/php/include
parent73524e327da20dfaebd84dada461366b1778f71a (diff)
downloadzabbix-5784b2fcc28da70b6fd6900a711b9c2265cca181.tar.gz
zabbix-5784b2fcc28da70b6fd6900a711b9c2265cca181.tar.xz
zabbix-5784b2fcc28da70b6fd6900a711b9c2265cca181.zip
Basic support for service availability.
git-svn-id: svn://svn.zabbix.com/trunk@464 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/config.inc.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 45fdfa6a..a1cc9637 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -13,6 +13,7 @@
return $row["cnt"];
}
+/* Rewrite ! */
function check_right($right,$permission,$id)
{
global $USER_DETAILS;
@@ -1460,7 +1461,7 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
return DBexecute($sql);
}
- function add_service($name,$triggerid,$linktrigger,$algorithm)
+ function add_service($serviceid,$name,$triggerid,$linktrigger,$algorithm)
{
if( isset($linktrigger)&&($linktrigger=="on") )
{
@@ -1477,7 +1478,16 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
$sql="insert into services (name,status,algorithm) values ('$name',0,$algorithm)";
}
$result=DBexecute($sql);
- return DBinsert_id($result,"services","serviceid");
+ if(!$result)
+ {
+ return FALSE;
+ }
+ $id=DBinsert_id($result,"services","serviceid");
+ if(isset($serviceid))
+ {
+ add_service_link($id,$serviceid,1);
+ }
+ return $id;
}
function add_host_to_services($hostid,$serviceid)
@@ -1486,8 +1496,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
$result=DBselect($sql);
while($row=DBfetch($result))
{
- $serviceid2=add_service($row["description"],$row["triggerid"],"on",0);
- add_service_link($serviceid2,$serviceid,0);
+ $serviceid2=add_service($serviceid,$row["description"],$row["triggerid"],"on",0);
+// add_service_link($serviceid2,$serviceid,0);
}
return 1;
}