summaryrefslogtreecommitdiffstats
path: root/frontends
diff options
context:
space:
mode:
Diffstat (limited to 'frontends')
-rw-r--r--frontends/php/config.php31
-rw-r--r--frontends/php/history.php2
-rw-r--r--frontends/php/include/config.inc.php8
-rw-r--r--frontends/php/include/items.inc.php3
-rw-r--r--frontends/php/include/local_en.inc.php9
-rw-r--r--frontends/php/include/screens.inc.php8
-rw-r--r--frontends/php/include/services.inc.php5
-rw-r--r--frontends/php/latestalarms.php1
-rw-r--r--frontends/php/media.php31
-rw-r--r--frontends/php/screenedit.php28
-rw-r--r--frontends/php/screens.php12
-rw-r--r--frontends/php/services.php94
12 files changed, 161 insertions, 71 deletions
diff --git a/frontends/php/config.php b/frontends/php/config.php
index 4fb41c14..d5c00d86 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -436,27 +436,32 @@
show_table_header(S_ESCALATION_DETAILS_BIG);
table_begin();
- table_header(array(S_STEP,S_DESCRIPTION_SMALL,S_ACTIONS));
+ table_header(array(S_LEVEL,S_DELAY_BEFORE_ACTION,S_TIME,S_ACTIONS));
table_row(array(
1,
- "30 seconds on this level",
- "Increase escalation level"),$col++);
+ "30",
+ "1-5,09:00-18:00",
+ "Execute action"),$col++);
table_row(array(
2,
- "60 seconds on this level",
- "Increase escalation level"),$col++);
+ "30",
+ "2-7,00:00-23:59",
+ "Execute action"),$col++);
table_row(array(
- 1,
- "",
- "Increase severity"),$col++);
+ 3,
+ "30",
+ "09:00-18:00",
+ "Execute action"),$col++);
table_row(array(
- 1,
- "",
- "Set escalation level to 5"),$col++);
+ 4,
+ "0",
+ "09:00-18:00",
+ "Increase severity"),$col++);
table_row(array(
- 1,
- "",
+ 5,
+ "300",
+ "09:00-18:00",
"Increase administrative hierarcy"),$col++);
$result=DBselect("select escalationid, name from escalations order by name");
diff --git a/frontends/php/history.php b/frontends/php/history.php
index 93451b1c..b0fc6bc1 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -162,7 +162,7 @@
}
else if($item["value_type"]==ITEM_VALUE_TYPE_LOG)
{
- $sql="select clock,value from history_log where itemid=".$_GET["itemid"]." and clock>$time and clock<$till order by id,clock desc";
+ $sql="select clock,value from history_log where itemid=".$_GET["itemid"]." and clock>$time and clock<$till order by id desc, clock desc";
}
else
{
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 0a94db27..321f0058 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1957,7 +1957,7 @@ echo "</head>";
# Add Media definition
- function add_media( $userid, $mediatypeid, $sendto, $severity, $active)
+ function add_media( $userid, $mediatypeid, $sendto, $severity, $active, $period)
{
$c=count($severity);
$s=0;
@@ -1965,13 +1965,13 @@ echo "</head>";
{
$s=$s|pow(2,(int)$severity[$i]);
}
- $sql="insert into media (userid,mediatypeid,sendto,active,severity) values ($userid,'$mediatypeid','$sendto',$active,$s)";
+ $sql="insert into media (userid,mediatypeid,sendto,active,severity,period) values ($userid,'$mediatypeid','$sendto',$active,$s,'$period')";
return DBexecute($sql);
}
# Update Media definition
- function update_media($mediaid, $userid, $mediatypeid, $sendto, $severity, $active)
+ function update_media($mediaid, $userid, $mediatypeid, $sendto, $severity, $active, $period)
{
$c=count($severity);
$s=0;
@@ -1979,7 +1979,7 @@ echo "</head>";
{
$s=$s|pow(2,(int)$severity[$i]);
}
- $sql="update media set userid=$userid, mediatypeid=$mediatypeid, sendto='$sendto', active=$active,severity=$s where mediaid=$mediaid";
+ $sql="update media set userid=$userid, mediatypeid=$mediatypeid, sendto='$sendto', active=$active,severity=$s,period=`$period` where mediaid=$mediaid";
return DBexecute($sql);
}
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php
index 348f38fd..796bb2b2 100644
--- a/frontends/php/include/items.inc.php
+++ b/frontends/php/include/items.inc.php
@@ -118,6 +118,9 @@
$snmpv3_authpassphrase=addslashes($snmpv3_authpassphrase);
$snmpv3_privpassphrase=addslashes($snmpv3_privpassphrase);
+ $sql="update items set lastlogsize=0 where itemid=$itemid and key_<>'$key'";
+ DBexecute($sql);
+
$sql="update items set description='$description',key_='$key',hostid=$hostid,delay=$delay,history=$history,nextcheck=0,status=$status,type=$type,snmp_community='$snmp_community',snmp_oid='$snmp_oid',value_type=$value_type,trapper_hosts='$trapper_hosts',snmp_port=$snmp_port,units='$units',multiplier=$multiplier,delta=$delta,snmpv3_securityname='$snmpv3_securityname',snmpv3_securitylevel=$snmpv3_securitylevel,snmpv3_authpassphrase='$snmpv3_authpassphrase',snmpv3_privpassphrase='$snmpv3_privpassphrase',formula='$formula',trends=$trends where itemid=$itemid";
$result=DBexecute($sql);
if($result)
diff --git a/frontends/php/include/local_en.inc.php b/frontends/php/include/local_en.inc.php
index 5170b98c..87efa7f8 100644
--- a/frontends/php/include/local_en.inc.php
+++ b/frontends/php/include/local_en.inc.php
@@ -25,7 +25,7 @@
// about.php
define("S_ABOUT_ZABBIX", "About ZABBIX");
- define("S_INFORMATION_ABOUT_ZABBIX", "Information about ZABBIX (v1.1alpha9)");
+ define("S_INFORMATION_ABOUT_ZABBIX", "Information about ZABBIX (v1.1alpha10)");
define("S_HOMEPAGE_OF_ZABBIX", "Homepage of ZABBIX");
define("S_HOMEPAGE_OF_ZABBIX_DETAILS", "This is home page of ZABBIX.");
define("S_LATEST_ZABBIX_MANUAL", "Latest ZABBIX Manual");
@@ -168,7 +168,8 @@
define("S_NO_ESCALATION_RULES_DEFINED", "No escalation rules defined");
define("S_NO_ESCALATION_DETAILS", "No escalation details");
define("S_ESCALATION_DETAILS_BIG", "ESCALATION DETAILS");
- define("S_STEP", "Step");
+ define("S_LEVEL", "Level");
+ define("S_DELAY_BEFORE_ACTION", "Delay before action");
define("S_IMAGES", "Images");
define("S_IMAGE", "Image");
define("S_IMAGES_BIG", "IMAGES");
@@ -192,7 +193,7 @@
define("S_COMPARE", "Compare");
// Footer
- define("S_ZABBIX_VER", "ZABBIX 1.1alpha9");
+ define("S_ZABBIX_VER", "ZABBIX 1.1alpha10");
define("S_COPYRIGHT_BY", "Copyright 2001-2005 by ");
define("S_CONNECTED_AS", "Connected as");
define("S_SIA_ZABBIX", "SIA Zabbix");
@@ -404,6 +405,7 @@
define("S_MEDIA_DELETED", "Media deleted");
define("S_CANNOT_DELETE_MEDIA", "Cannot delete media");
define("S_SEND_TO", "Send to");
+ define("S_WHEN_ACTIVE", "When active");
define("S_NO_MEDIA_DEFINED", "No media defined");
define("S_NEW_MEDIA", "New media");
define("S_USE_IF_SEVERITY", "Use if severity");
@@ -515,6 +517,7 @@
// screenedit.php
define("S_MAP", "Map");
define("S_PLAIN_TEXT", "Plain text");
+ define("S_COLSPAN", "Colspan");
// screens.php
define("S_CUSTOM_SCREENS", "Custom screens");
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 1439e45e..6f2f955c 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -55,17 +55,17 @@
return DBexecute($sql);
}
- function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height)
+ function add_screen_item($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan)
{
$sql="delete from screens_items where screenid=$screenid and x=$x and y=$y";
DBexecute($sql);
- $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height) values ($resource,$screenid,$x,$y,$resourceid,$width,$height)";
+ $sql="insert into screens_items (resource,screenid,x,y,resourceid,width,height,colspan) values ($resource,$screenid,$x,$y,$resourceid,$width,$height,$colspan)";
return DBexecute($sql);
}
- function update_screen_item($screenitemid,$resource,$resourceid,$width,$height)
+ function update_screen_item($screenitemid,$resource,$resourceid,$width,$height,$colspan)
{
- $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height where screenitemid=$screenitemid";
+ $sql="update screens_items set resource=$resource,resourceid=$resourceid,width=$width,height=$height,colspan=$colspan where screenitemid=$screenitemid";
return DBexecute($sql);
}
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php
index 23e68379..bbaabf5d 100644
--- a/frontends/php/include/services.inc.php
+++ b/frontends/php/include/services.inc.php
@@ -31,6 +31,11 @@
}
if( isset($linktrigger)&&($linktrigger=="on") )
{
+ if(!isset($triggerid))
+ {
+ error("Choose trigger first");
+ return false;
+ }
// $trigger=get_trigger_by_triggerid($triggerid);
// $description=$trigger["description"];
// if( strstr($description,"%s"))
diff --git a/frontends/php/latestalarms.php b/frontends/php/latestalarms.php
index b8205b76..409905d0 100644
--- a/frontends/php/latestalarms.php
+++ b/frontends/php/latestalarms.php
@@ -97,6 +97,7 @@
$h2=$h2.form_select("hostid",$row["hostid"],$row["host"]);
}
$h2=$h2."</select>&nbsp;";
+
if(isset($_GET["start"]))
{
$h2=$h2."<input class=\"biginput\" name=\"start\" type=hidden value=".$_GET["start"]." size=8>";
diff --git a/frontends/php/media.php b/frontends/php/media.php
index e68cdb41..50d11ee4 100644
--- a/frontends/php/media.php
+++ b/frontends/php/media.php
@@ -60,7 +60,7 @@
if(isset($_GET["3"])) $severity=array_merge($severity,array(3));
if(isset($_GET["4"])) $severity=array_merge($severity,array(4));
if(isset($_GET["5"])) $severity=array_merge($severity,array(5));
- $result=add_media( $_GET["userid"], $_GET["mediatypeid"], $_GET["sendto"],$severity,$_GET["active"]);
+ $result=add_media( $_GET["userid"], $_GET["mediatypeid"], $_GET["sendto"],$severity,$_GET["active"],$_GET["period"]);
show_messages($result, S_MEDIA_ADDED, S_CANNOT_ADD_MEDIA);
}
elseif($_GET["register"]=="update")
@@ -72,7 +72,7 @@
if(isset($_GET["3"])) $severity=array_merge($severity,array(3));
if(isset($_GET["4"])) $severity=array_merge($severity,array(4));
if(isset($_GET["5"])) $severity=array_merge($severity,array(5));
- $result=update_media($_GET["mediaid"], $_GET["userid"], $_GET["mediatypeid"], $_GET["sendto"],$severity,$_GET["active"]);
+ $result=update_media($_GET["mediaid"], $_GET["userid"], $_GET["mediatypeid"], $_GET["sendto"],$severity,$_GET["active"],$_GET["period"]);
show_messages($result,S_MEDIA_UPDATED,S_CANNOT_UPDATE_MEDIA);
}
elseif($_GET["register"]=="delete")
@@ -89,11 +89,11 @@
?>
<?php
- $sql="select m.mediaid,mt.description,m.sendto,m.active from media m,media_type mt where m.mediatypeid=mt.mediatypeid and m.userid=".$_GET["userid"]." order by mt.type,m.sendto";
+ $sql="select m.mediaid,mt.description,m.sendto,m.active,m.period from media m,media_type mt where m.mediatypeid=mt.mediatypeid and m.userid=".$_GET["userid"]." order by mt.type,m.sendto";
$result=DBselect($sql);
table_begin();
- table_header(array(S_TYPE, S_SEND_TO,S_STATUS,S_ACTIONS));
+ table_header(array(S_TYPE,S_SEND_TO,S_WHEN_ACTIVE,S_STATUS,S_ACTIONS));
$col=0;
while($row=DBfetch($result))
@@ -110,6 +110,7 @@
table_row(array(
$row["description"],
$row["sendto"],
+ $row["period"],
$status,
$actions
),$col++);
@@ -126,12 +127,13 @@
<?php
if(isset($_GET["mediaid"]))
{
- $sql="select m.severity,m.sendto,m.active,m.mediatypeid from media m where m.mediaid=".$_GET["mediaid"];
+ $sql="select m.severity,m.sendto,m.active,m.mediatypeid,m.period from media m where m.mediaid=".$_GET["mediaid"];
$result=DBselect($sql);
$severity=DBget_field($result,0,0);
$sendto=DBget_field($result,0,1);
$active=DBget_field($result,0,2);
$mediatypeid=DBget_field($result,0,3);
+ $period=DBget_field($result,0,4);
}
else
{
@@ -139,6 +141,7 @@
$severity=63;
$mediatypeid=-1;
$active=0;
+ $period="1-7,00:00-23:59";
}
show_form_begin("media.media");
@@ -178,23 +181,11 @@
echo "<input class=\"biginput\" name=\"sendto\" size=20 value='$sendto'>";
show_table2_v_delimiter($col++);
-/* echo nbsp(S_USE_IF_SEVERITY);
+ echo nbsp(S_WHEN_ACTIVE);
show_table2_h_delimiter();
- echo "<select multiple class=\"biginput\" name=\"severity[]\" size=\"5\">";
- $selected=iif( (1&$severity) == 1,"selected","");
- echo "<option value=\"0\" $selected>".S_NOT_CLASSIFIED;
- $selected=iif( (2&$severity) == 2,"selected","");
- echo "<option value=\"1\" $selected>".S_INFORMATION;
- $selected=iif( (4&$severity) == 4,"selected","");
- echo "<option value=\"2\" $selected>".S_WARNING;
- $selected=iif( (8&$severity) == 8,"selected","");
- echo "<option value=\"3\" $selected>".S_AVERAGE;
- $selected=iif( (16&$severity) ==16,"selected","");
- echo "<option value=\"4\" $selected>".S_HIGH;
- $selected=iif( (32&$severity) ==32,"selected","");
- echo "<option value=\"5\" $selected>".S_DISASTER;
- echo "</select>";*/
+ echo "<input class=\"biginput\" name=\"period\" size=48 value='$period'>";
+ show_table2_v_delimiter($col++);
echo nbsp(S_USE_IF_SEVERITY);
show_table2_h_delimiter();
$checked=iif( (1&$severity) == 1,"checked","");
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 1fa1ebb3..f418deef 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -49,7 +49,7 @@
// delete_screen_item($_GET["screenitemid"]);
// unset($_GET["screenitemid"]);
// }
- $result=add_screen_item($_GET["resource"],$_GET["screenid"],$_GET["x"],$_GET["y"],$_GET["resourceid"],$_GET["width"],$_GET["height"]);
+ $result=add_screen_item($_GET["resource"],$_GET["screenid"],$_GET["x"],$_GET["y"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"]);
unset($_GET["x"]);
show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
}
@@ -61,7 +61,7 @@
}
if($_GET["register"]=="update")
{
- $result=update_screen_item($_GET["screenitemid"],$_GET["resource"],$_GET["resourceid"],$_GET["width"],$_GET["height"]);
+ $result=update_screen_item($_GET["screenitemid"],$_GET["resource"],$_GET["resourceid"],$_GET["width"],$_GET["height"],$_GET["colspan"]);
show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
unset($_GET["x"]);
}
@@ -81,11 +81,6 @@
echo "<TR>";
for($c=0;$c<$row["cols"];$c++)
{
- echo "<TD align=\"center\" valign=\"top\">\n";
-
- echo "<a name=\"form\"></a>";
- echo "<form method=\"get\" action=\"screenedit.php\">";
-
$iresult=DBSelect("select * from screens_items where screenid=$screenid and x=$c and y=$r");
if(DBnum_rows($iresult)>0)
{
@@ -95,6 +90,7 @@
$resourceid=$irow["resourceid"];
$width=$irow["width"];
$height=$irow["height"];
+ $colspan=$irow["colspan"];
}
else
{
@@ -103,7 +99,19 @@
$resourceid=0;
$width=500;
$height=100;
+ $colspan=0;
+ }
+ if($colspan==0)
+ {
+ echo "<TD align=\"center\" valign=\"top\">\n";
+ }
+ else
+ {
+ echo "<TD align=\"center\" valign=\"top\" colspan=\"$colspan\">\n";
+ $c=$c+$colspan-1;
}
+ echo "<a name=\"form\"></a>";
+ echo "<form method=\"get\" action=\"screenedit.php\">";
if(isset($_GET["x"])&&($_GET["x"]==$c)&&($_GET["y"]==$r))
{
@@ -112,6 +120,7 @@
$screenitemid=@iif(isset($_GET["screenitemid"]),$_GET["screenitemid"],$screenitemid);
$width=@iif(isset($_GET["width"]),$_GET["width"],$width);
$height=@iif(isset($_GET["height"]),$_GET["height"],$height);
+ $colspan=@iif(isset($_GET["colspan"]),$_GET["colspan"],$colspan);
show_form_begin("screenedit.cell");
echo S_SCREEN_CELL_CONFIGURATION;
@@ -225,6 +234,11 @@
echo "<input class=\"biginput\" name=\"height\" type=\"hidden\" size=5 value=\"$height\">";
}
+ show_table2_v_delimiter();
+ echo S_COLSPAN;
+ show_table2_h_delimiter();
+ echo "<input class=\"biginput\" name=\"colspan\" size=2 value=\"$colspan\">";
+
show_table2_v_delimiter2();
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
if($resourceid!=0)
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 7799a665..a93a4dfe 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -104,10 +104,10 @@
echo "<TR>";
for($c=0;$c<$row["cols"];$c++)
{
- echo "<TD align=\"center\" valign=\"top\">\n";
$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
$iresult=DBSelect($sql);
+ $colspan=0;
if(DBnum_rows($iresult)>0)
{
$irow=DBfetch($iresult);
@@ -116,8 +116,18 @@
$resourceid=$irow["resourceid"];
$width=$irow["width"];
$height=$irow["height"];
+ $colspan=$irow["colspan"];
}
+ if($colspan==0)
+ {
+ echo "<TD align=\"center\" valign=\"top\">\n";
+ }
+ else
+ {
+ echo "<TD align=\"center\" valign=\"top\" colspan=\"$colspan\">\n";
+ $c=$c+$colspan-1;
+ }
if(DBnum_rows($iresult)>0)
{
if($resource == 0)
diff --git a/frontends/php/services.php b/frontends/php/services.php
index 3057bd88..1d41c498 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -52,7 +52,7 @@
}
if($_GET["register"]=="add server")
{
- $result=add_host_to_services($_GET["hostid"],$_GET["serviceid"]);
+ $result=add_host_to_services($_GET["serverid"],$_GET["serviceid"]);
show_messages($result, S_TRIGGER_ADDED, S_CANNOT_ADD_TRIGGER);
}
if($_GET["register"]=="add link")
@@ -229,6 +229,11 @@
echo S_SERVICE;
$col=0;
+ if(isset($_GET["groupid"])&&($_GET["groupid"]==0))
+ {
+ unset($_GET["groupid"]);
+ }
+
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"services.php\">";
if(isset($_GET["serviceid"]))
@@ -308,27 +313,80 @@
show_table2_v_delimiter($col++);
echo S_TRIGGER;
show_table2_h_delimiter();
- $result=DBselect("select triggerid,description from triggers order by description");
- echo "<select class=\"biginput\" name=\"triggerid\" size=1>";
- for($i=0;$i<DBnum_rows($result);$i++)
- {
- $triggerid_=DBget_field($result,$i,0);
+ $h2="<select class=\"biginput\" name=\"groupid\" onChange=\"submit()\">";
+ $h2=$h2.form_select("groupid",0,S_ALL_SMALL);
+ $result=DBselect("select groupid,name from groups order by name");
+ while($row=DBfetch($result))
+ {
+// Check if at least one host with read permission exists for this group
+ $result2=DBselect("select h.hostid,h.host from hosts h,items i,hosts_groups hg where h.status=".HOST_STATUS_MONITORED." and h.hostid=i.hostid and hg.groupid=".$row["groupid"]." and hg.hostid=h.hostid group by h.hostid,h.host order by h.host");
+ $cnt=0;
+ while($row2=DBfetch($result2))
+ {
+ if(!check_right("Host","R",$row2["hostid"]))
+ {
+ continue;
+ }
+ $cnt=1; break;
+ }
+ if($cnt!=0)
+ {
+ $h2=$h2.form_select("groupid",$row["groupid"],$row["name"]);
+ }
+ }
+ $h2=$h2."</select>&nbsp;";
+
+ $h2=$h2."<select class=\"biginput\" name=\"hostid\" onChange=\"submit()\">";
+ $h2=$h2.form_select("hostid",0,S_SELECT_HOST_DOT_DOT_DOT);
+
+ if(isset($_GET["groupid"]))
+ {
+ $sql="select h.hostid,h.host from hosts h,items i,hosts_groups hg where h.status=".HOST_STATUS_MONITORED." and h.hostid=i.hostid and hg.groupid=".$_GET["groupid"]." and hg.hostid=h.hostid group by h.hostid,h.host order by h.host";
+ }
+ else
+ {
+ $sql="select h.hostid,h.host from hosts h,items i where h.status=".HOST_STATUS_MONITORED." and h.hostid=i.hostid group by h.hostid,h.host order by h.host";
+ }
+
+ $result=DBselect($sql);
+ while($row=DBfetch($result))
+ {
+ if(!check_right("Host","R",$row["hostid"]))
+ {
+ continue;
+ }
+ $h2=$h2.form_select("hostid",$row["hostid"],$row["host"]);
+ }
+ $h2=$h2."</select>&nbsp;";
+ echo $h2;
+
+ if(isset($_GET["hostid"]))
+ {
+ show_table2_v_delimiter($col++);
+ echo "&nbsp;";
+ show_table2_h_delimiter();
+ $result=DBselect("select t.triggerid,t.description from triggers t,functions f, hosts h, items i where h.hostid=i.hostid and f.itemid=i.itemid and t.triggerid=f.triggerid and h.hostid=".$_GET["hostid"]." order by t.description");
+ echo "<select class=\"biginput\" name=\"triggerid\" size=1>";
+ for($i=0;$i<DBnum_rows($result);$i++)
+ {
+ $triggerid_=DBget_field($result,$i,0);
// $description_=DBget_field($result,$i,1);
// if( strstr($description_,"%s"))
// {
- $description_=expand_trigger_description($triggerid_);
+ $description_=expand_trigger_description($triggerid_);
// }
// if(isset($_GET["triggerid"]) && ($_GET["triggerid"]==$triggerid_))
- if(isset($triggerid) && ($triggerid==$triggerid_))
- {
- echo "<OPTION VALUE='$triggerid_' SELECTED>$description_";
- }
- else
- {
- echo "<OPTION VALUE='$triggerid_'>$description_";
- }
- }
- echo "</SELECT>";
+ if(isset($triggerid) && ($triggerid==$triggerid_))
+ {
+ echo "<OPTION VALUE='$triggerid_' SELECTED>$description_";
+ }
+ else
+ {
+ echo "<OPTION VALUE='$triggerid_'>$description_";
+ }
+ }
+ echo "</SELECT>";
+ }
show_table2_v_delimiter($col++);
echo nbsp(S_SORT_ORDER_0_999);
@@ -433,7 +491,7 @@
echo S_SERVER;
show_table2_h_delimiter();
$result=DBselect("select hostid,host from hosts order by host");
- echo "<select class=\"biginput\" name=\"hostid\" size=1>";
+ echo "<select class=\"biginput\" name=\"serverid\" size=1>";
while($row=DBfetch($result))
{
echo "<OPTION VALUE='".$row["hostid"]."'>".$row["host"];
generated by cgit (git 2.34.1) at 2024-10-01 17:21:56 +0000