From 07ea4eb6c1927b132fc294271841066c11ab2955 Mon Sep 17 00:00:00 2001 From: osmiy Date: Tue, 21 Mar 2006 14:44:38 +0000 Subject: - developed remote commads execution on specific actions (Eugene) - added "URL" module for screens (Eugene) - fix some bugs - clean code git-svn-id: svn://svn.zabbix.com/trunk@2703 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/services.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'frontends/php/services.php') diff --git a/frontends/php/services.php b/frontends/php/services.php index 28ab683e..225dafb2 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -365,20 +365,29 @@ $soft = get_request("soft",1); } - $cmbServices = new CComboBox("serviceupid",$serviceupid); - $result=DBselect("select serviceid,triggerid,name from services order by name"); + $frmLink->AddVar("serviceupid",$_REQUEST["serviceid"]); + + $service = get_service_by_serviceid($_REQUEST["serviceid"]); + $name = $service["name"]; + if(isset($service["triggerid"])) + $name .= ": ".expand_trigger_description($service["triggerid"]); + $frmLink->AddRow(S_SERVICE_1, new CTextBox("service",$name,60,NULL,'yes')); + + $cmbServices = new CComboBox("servicedownid",$servicedownid); + $result=DBselect("select serviceid,triggerid,name from services where serviceid<>$serviceupid order by name"); while($row=Dbfetch($result)) { + if(DBnum_rows(DBselect("select linkid from services_links". + " where servicedownid<>$servicedownid and serviceupid=$serviceupid and servicedownid=".$row["serviceid"]))) + continue; + $name = $row["name"]; if(isset($row["triggerid"])) $name .= ": ".expand_trigger_description($row["triggerid"]); $cmbServices->AddItem($row["serviceid"],$name); } - $frmLink->AddRow(S_SERVICE_1, $cmbServices); - $cmbServices->SetName("servicedownid"); - $cmbServices->SetValue($servicedownid); $frmLink->AddRow(S_SERVICE_2, $cmbServices); $frmLink->AddRow(S_SOFT_LINK_Q, new CCheckBox("soft",$soft)); -- cgit