summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-10-24 05:20:19 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-10-24 05:20:19 +0000
commit9a1e779bc865fddde2adc39dde378f0a0439594a (patch)
tree472789ea587b232cb705de4a9f9783002a169566 /frontends/php/include
parentb9e14335fe68cdd6251239883f141a0e0556ac6b (diff)
downloadzabbix-9a1e779bc865fddde2adc39dde378f0a0439594a.tar.gz
zabbix-9a1e779bc865fddde2adc39dde378f0a0439594a.tar.xz
zabbix-9a1e779bc865fddde2adc39dde378f0a0439594a.zip
- all $_GET and $_POST replaced by $_REQUEST. Thanks to James Wells. (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2215 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/config.inc.php28
-rw-r--r--frontends/php/include/defines.inc.php2
-rw-r--r--frontends/php/include/forms.inc.php136
-rw-r--r--frontends/php/include/graphs.inc.php80
-rw-r--r--frontends/php/include/html.inc.php16
5 files changed, 131 insertions, 131 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index f465b958..ad021cbc 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -947,7 +947,7 @@
global $PHP_AUTH_USER,$PHP_AUTH_PW;
global $USER_DETAILS;
global $_COOKIE;
- global $_GET;
+ global $_REQUEST;
// global $sessionid;
if(isset($_COOKIE["sessionid"]))
@@ -2899,9 +2899,9 @@ echo "</head>";
foreach($a as $label=>$sec)
{
echo "[";
- if($_GET["period"]>$sec)
+ if($_REQUEST["period"]>$sec)
{
- $tmp=$_GET["period"]-$sec;
+ $tmp=$_REQUEST["period"]-$sec;
echo("<A HREF=\"charts.php?period=$tmp".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">-</A>");
}
else
@@ -2912,7 +2912,7 @@ echo "</head>";
echo("<A HREF=\"charts.php?period=$sec".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">");
echo($label."</A>");
- $tmp=$_GET["period"]+$sec;
+ $tmp=$_REQUEST["period"]+$sec;
echo("<A HREF=\"charts.php?period=$tmp".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">+</A>");
echo "]&nbsp;";
@@ -2923,7 +2923,7 @@ echo "</head>";
echo "</TD>";
echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
echo "<b>".nbsp(S_KEEP_PERIOD).":</b>&nbsp;";
- if($_GET["keep"] == 1)
+ if($_REQUEST["keep"] == 1)
{
echo("[<A HREF=\"charts.php?keep=0".url_param($resource).url_param("from").url_param("period").url_param("fullscreen")."\">".S_ON_C."</a>]");
}
@@ -2935,7 +2935,7 @@ echo "</head>";
echo "</TR>";
echo "<TR BGCOLOR=#FFFFFF>";
echo "<TD>";
- if(isset($_GET["stime"]))
+ if(isset($_REQUEST["stime"]))
{
echo "<div align=left>" ;
echo "<b>".S_MOVE.":</b>&nbsp;" ;
@@ -2948,7 +2948,7 @@ echo "</head>";
{
echo "[";
- $stime=$_GET["stime"];
+ $stime=$_REQUEST["stime"];
$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
$tmp=$tmp-3600*$hours;
$tmp=date("YmdHi",$tmp);
@@ -2956,7 +2956,7 @@ echo "</head>";
echo($label);
- $stime=$_GET["stime"];
+ $stime=$_REQUEST["stime"];
$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
$tmp=$tmp+3600*$hours;
$tmp=date("YmdHi",$tmp);
@@ -2978,14 +2978,14 @@ echo "</head>";
foreach($a as $label=>$hours)
{
echo "[";
- $tmp=$_GET["from"]+$hours;
+ $tmp=$_REQUEST["from"]+$hours;
echo("<A HREF=\"charts.php?from=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
echo($label);
- if($_GET["from"]>=$hours)
+ if($_REQUEST["from"]>=$hours)
{
- $tmp=$_GET["from"]-$hours;
+ $tmp=$_REQUEST["from"]-$hours;
echo("<A HREF=\"charts.php?from=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
}
else
@@ -3001,11 +3001,11 @@ echo "</head>";
echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
// echo("<div align=left>");
echo "<form method=\"put\" action=\"charts.php\">";
- echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_GET[$resource]."\" size=12>";
+ echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_REQUEST[$resource]."\" size=12>";
echo "<input name=\"period\" type=\"hidden\" value=\"".(9*3600)."\" size=12>";
- if(isset($_GET["stime"]))
+ if(isset($_REQUEST["stime"]))
{
- echo "<input name=\"stime\" class=\"biginput\" value=\"".$_GET["stime"]."\" size=12>";
+ echo "<input name=\"stime\" class=\"biginput\" value=\"".$_REQUEST["stime"]."\" size=12>";
}
else
{
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 53295761..e883b3e9 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -111,7 +111,7 @@
/* Support for PHP5. PHP5 does not have $HTTP_..._VARS */
if (!function_exists('version_compare'))
{
- $_GET = $HTTP_GET_VARS;
+ $_REQUEST = $HTTP_GET_VARS;
$_POST = $HTTP_POST_VARS;
$_COOKIE = $HTTP_COOKIE_VARS;
}
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 8a64aa08..6ba00843 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -60,8 +60,8 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"hosts.php\">";
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
- echo "<input class=\"biginput\" name=\"hostid\" type=\"hidden\" value=\"".$_GET["hostid"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"hostid\" type=\"hidden\" value=\"".$_REQUEST["hostid"]."\" size=8>";
if(isset($hosttemplateid))
{
echo "<input class=\"biginput\" name=\"hosttemplateid\" type=\"hidden\" value=\"$hosttemplateid\" size=8>";
@@ -169,7 +169,7 @@
if($profile==0) echo "<form method=\"get\" action=\"users.php\">";
else echo "<form method=\"get\" action=\"profile.php\">";
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
if(isset($userid))
{
echo "<input class=\"biginput\" name=\"userid\" type=\"hidden\" value=\"$userid\" size=8>";
@@ -254,38 +254,38 @@
# Insert form for Item information
function insert_item_form()
{
- global $_GET;
-
- $description=@iif(isset($_GET["description"]),$_GET["description"],"");
- $key=@iif(isset($_GET["key"]),$_GET["key"],"");
- $host=@iif(isset($_GET["host"]),$_GET["host"],"");
- $port=@iif(isset($_GET["port"]),$_GET["port"],10050);
- $delay=@iif(isset($_GET["delay"]),$_GET["delay"],30);
- $history=@iif(isset($_GET["history"]),$_GET["history"],90);
- $trends=@iif(isset($_GET["trends"]),$_GET["trends"],365);
- $status=@iif(isset($_GET["status"]),$_GET["status"],0);
- $type=@iif(isset($_GET["type"]),$_GET["type"],0);
- $snmp_community=@iif(isset($_GET["snmp_community"]),$_GET["snmp_community"],"public");
- $snmp_oid=@iif(isset($_GET["snmp_oid"]),$_GET["snmp_oid"],"interfaces.ifTable.ifEntry.ifInOctets.1");
- $value_type=@iif(isset($_GET["value_type"]),$_GET["value_type"],0);
- $trapper_hosts=@iif(isset($_GET["trapper_hosts"]),$_GET["trapper_hosts"],"");
- $snmp_port=@iif(isset($_GET["snmp_port"]),$_GET["snmp_port"],161);
- $units=@iif(isset($_GET["units"]),$_GET["units"],'');
- $multiplier=@iif(isset($_GET["multiplier"]),$_GET["multiplier"],0);
- $hostid=@iif(isset($_GET["hostid"]),$_GET["hostid"],0);
- $delta=@iif(isset($_GET["delta"]),$_GET["delta"],0);
-
- $snmpv3_securityname=@iif(isset($_GET["snmpv3_securityname"]),$_GET["snmpv3_securityname"],"");
- $snmpv3_securitylevel=@iif(isset($_GET["snmpv3_securitylevel"]),$_GET["snmpv3_securitylevel"],0);
- $snmpv3_authpassphrase=@iif(isset($_GET["snmpv3_authpassphrase"]),$_GET["snmpv3_authpassphrase"],"");
- $snmpv3_privpassphrase=@iif(isset($_GET["snmpv3_privpassphrase"]),$_GET["snmpv3_privpassphrase"],"")
+ global $_REQUEST;
+
+ $description=@iif(isset($_REQUEST["description"]),$_REQUEST["description"],"");
+ $key=@iif(isset($_REQUEST["key"]),$_REQUEST["key"],"");
+ $host=@iif(isset($_REQUEST["host"]),$_REQUEST["host"],"");
+ $port=@iif(isset($_REQUEST["port"]),$_REQUEST["port"],10050);
+ $delay=@iif(isset($_REQUEST["delay"]),$_REQUEST["delay"],30);
+ $history=@iif(isset($_REQUEST["history"]),$_REQUEST["history"],90);
+ $trends=@iif(isset($_REQUEST["trends"]),$_REQUEST["trends"],365);
+ $status=@iif(isset($_REQUEST["status"]),$_REQUEST["status"],0);
+ $type=@iif(isset($_REQUEST["type"]),$_REQUEST["type"],0);
+ $snmp_community=@iif(isset($_REQUEST["snmp_community"]),$_REQUEST["snmp_community"],"public");
+ $snmp_oid=@iif(isset($_REQUEST["snmp_oid"]),$_REQUEST["snmp_oid"],"interfaces.ifTable.ifEntry.ifInOctets.1");
+ $value_type=@iif(isset($_REQUEST["value_type"]),$_REQUEST["value_type"],0);
+ $trapper_hosts=@iif(isset($_REQUEST["trapper_hosts"]),$_REQUEST["trapper_hosts"],"");
+ $snmp_port=@iif(isset($_REQUEST["snmp_port"]),$_REQUEST["snmp_port"],161);
+ $units=@iif(isset($_REQUEST["units"]),$_REQUEST["units"],'');
+ $multiplier=@iif(isset($_REQUEST["multiplier"]),$_REQUEST["multiplier"],0);
+ $hostid=@iif(isset($_REQUEST["hostid"]),$_REQUEST["hostid"],0);
+ $delta=@iif(isset($_REQUEST["delta"]),$_REQUEST["delta"],0);
+
+ $snmpv3_securityname=@iif(isset($_REQUEST["snmpv3_securityname"]),$_REQUEST["snmpv3_securityname"],"");
+ $snmpv3_securitylevel=@iif(isset($_REQUEST["snmpv3_securitylevel"]),$_REQUEST["snmpv3_securitylevel"],0);
+ $snmpv3_authpassphrase=@iif(isset($_REQUEST["snmpv3_authpassphrase"]),$_REQUEST["snmpv3_authpassphrase"],"");
+ $snmpv3_privpassphrase=@iif(isset($_REQUEST["snmpv3_privpassphrase"]),$_REQUEST["snmpv3_privpassphrase"],"")
;
- $formula=@iif(isset($_GET["formula"]),$_GET["formula"],"1");
- $logtimefmt=@iif(isset($_GET["logtimefmt"]),$_GET["logtimefmt"],"");
+ $formula=@iif(isset($_REQUEST["formula"]),$_REQUEST["formula"],"1");
+ $logtimefmt=@iif(isset($_REQUEST["logtimefmt"]),$_REQUEST["logtimefmt"],"");
- if(isset($_GET["register"])&&($_GET["register"] == "change"))
+ if(isset($_REQUEST["register"])&&($_REQUEST["register"] == "change"))
{
- $result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta,i.trends,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,i.logtimefmt from items i,hosts h where i.itemid=".$_GET["itemid"]." and h.hostid=i.hostid");
+ $result=DBselect("select i.description, i.key_, h.host, h.port, i.delay, i.history, i.status, i.type, i.snmp_community,i.snmp_oid,i.value_type,i.trapper_hosts,i.snmp_port,i.units,i.multiplier,h.hostid,i.delta,i.trends,i.snmpv3_securityname,i.snmpv3_securitylevel,i.snmpv3_authpassphrase,i.snmpv3_privpassphrase,i.formula,i.logtimefmt from items i,hosts h where i.itemid=".$_REQUEST["itemid"]." and h.hostid=i.hostid");
$description=DBget_field($result,0,0);
$key=DBget_field($result,0,1);
@@ -294,7 +294,7 @@
$delay=DBget_field($result,0,4);
$history=DBget_field($result,0,5);
$status=DBget_field($result,0,6);
- $type=iif(isset($_GET["type"]),isset($_GET["type"]),DBget_field($result,0,7));
+ $type=iif(isset($_REQUEST["type"]),isset($_REQUEST["type"]),DBget_field($result,0,7));
$snmp_community=DBget_field($result,0,8);
$snmp_oid=DBget_field($result,0,9);
$value_type=DBget_field($result,0,10);
@@ -321,9 +321,9 @@
$col=0;
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"items.php#form\">";
- if(isset($_GET["itemid"]))
+ if(isset($_REQUEST["itemid"]))
{
- echo "<input class=\"biginput\" name=\"itemid\" type=hidden value=".$_GET["itemid"].">";
+ echo "<input class=\"biginput\" name=\"itemid\" type=hidden value=".$_REQUEST["itemid"].">";
}
echo S_DESCRIPTION;
show_table2_h_delimiter();
@@ -607,7 +607,7 @@
show_table2_v_delimiter2();
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add to all hosts\" onClick=\"return Confirm('Add item to all hosts?');\">";
- if(isset($_GET["itemid"]))
+ if(isset($_REQUEST["itemid"]))
{
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete\" onClick=\"return Confirm('Delete selected item?');\">";
@@ -644,7 +644,7 @@
show_table2_v_delimiter2();
echo "<select class=\"biginput\" name=\"action\">";
echo "<option value=\"add to group\">".S_ADD_TO_GROUP;
- if(isset($_GET["itemid"]))
+ if(isset($_REQUEST["itemid"]))
{
echo "<option value=\"update in group\">".S_UPDATE_IN_GROUP;
echo "<option value=\"delete from group\">".S_DELETE_FROM_GROUP;
@@ -658,7 +658,7 @@
# Insert form for Host Groups
function insert_hostgroups_form($groupid)
{
- global $_GET;
+ global $_REQUEST;
$col=0;
@@ -678,9 +678,9 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"hosts.php\">";
- if(isset($_GET["groupid"]))
+ if(isset($_REQUEST["groupid"]))
{
- echo "<input name=\"groupid\" type=\"hidden\" value=\"".$_GET["groupid"]."\" size=8>";
+ echo "<input name=\"groupid\" type=\"hidden\" value=\"".$_REQUEST["groupid"]."\" size=8>";
}
echo S_GROUP_NAME;
show_table2_h_delimiter();
@@ -693,9 +693,9 @@
$result=DBselect("select distinct hostid,host from hosts order by host");
while($row=DBfetch($result))
{
- if(isset($_GET["groupid"]))
+ if(isset($_REQUEST["groupid"]))
{
- $sql="select count(*) as count from hosts_groups where hostid=".$row["hostid"]." and groupid=".$_GET["groupid"];
+ $sql="select count(*) as count from hosts_groups where hostid=".$row["hostid"]." and groupid=".$_REQUEST["groupid"];
$result2=DBselect($sql);
$row2=DBfetch($result2);
if($row2["count"]==0)
@@ -716,7 +716,7 @@
show_table2_v_delimiter2();
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add group\">";
- if(isset($_GET["groupid"]))
+ if(isset($_REQUEST["groupid"]))
{
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update group\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete group\" onClick=\"return Confirm('Delete selected group?');\">";
@@ -730,7 +730,7 @@
# Insert form for User Groups
function insert_usergroups_form($usrgrpid)
{
- global $_GET;
+ global $_REQUEST;
$col=0;
@@ -766,9 +766,9 @@
$result=DBselect("select distinct userid,alias from users order by alias");
while($row=DBfetch($result))
{
- if(isset($_GET["usrgrpid"]))
+ if(isset($_REQUEST["usrgrpid"]))
{
- $sql="select count(*) as count from users_groups where userid=".$row["userid"]." and usrgrpid=".$_GET["usrgrpid"];
+ $sql="select count(*) as count from users_groups where userid=".$row["userid"]." and usrgrpid=".$_REQUEST["usrgrpid"];
$result2=DBselect($sql);
$row2=DBfetch($result2);
if($row2["count"]==0)
@@ -793,9 +793,9 @@
$result=DBselect("select distinct userid,alias from users order by alias");
while($row=DBfetch($result))
{
- if(isset($_GET["usrgrpid"]))
+ if(isset($_REQUEST["usrgrpid"]))
{
- $sql="select count(*) as count from users_groups where userid=".$row["userid"]." and usrgrpid=".$_GET["usrgrpid"];
+ $sql="select count(*) as count from users_groups where userid=".$row["userid"]." and usrgrpid=".$_REQUEST["usrgrpid"];
$result2=DBselect($sql);
$row2=DBfetch($result2);
if($row2["count"]==0)
@@ -816,7 +816,7 @@
show_table2_v_delimiter2();
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add group\">";
- if(isset($_GET["usrgrpid"]))
+ if(isset($_REQUEST["usrgrpid"]))
{
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update group\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete group\" onClick=\"return Confirm('Delete selected group?');\">";
@@ -874,7 +874,7 @@
function insert_login_form()
{
- global $_GET;
+ global $_REQUEST;
$col=0;
@@ -886,7 +886,7 @@
echo "Login name";
show_table2_h_delimiter();
-// echo "<input name=\"name\" value=\"".$_GET["name"]."\" size=20>";
+// echo "<input name=\"name\" value=\"".$_REQUEST["name"]."\" size=20>";
echo "<input class=\"biginput\" name=\"name\" value=\"\" size=20>";
show_table2_v_delimiter($col++);
@@ -1089,18 +1089,18 @@
function insert_graph_form()
{
- global $_GET;
+ global $_REQUEST;
- $name=@iif(isset($_GET["name"]),$_GET["name"],"");
- $width=@iif(isset($_GET["width"]),$_GET["width"],900);
- $height=@iif(isset($_GET["height"]),$_GET["height"],200);
- $yaxistype=@iif(isset($_GET["yaxistype"]),$_GET["yaxistype"],GRAPH_YAXIS_TYPE_CALCULATED);
- $yaxismin=@iif(isset($_GET["yaxismin"]),$_GET["yaxismin"],0.00);
- $yaxismax=@iif(isset($_GET["yaxismax"]),$_GET["yaxismax"],100.00);
+ $name=@iif(isset($_REQUEST["name"]),$_REQUEST["name"],"");
+ $width=@iif(isset($_REQUEST["width"]),$_REQUEST["width"],900);
+ $height=@iif(isset($_REQUEST["height"]),$_REQUEST["height"],200);
+ $yaxistype=@iif(isset($_REQUEST["yaxistype"]),$_REQUEST["yaxistype"],GRAPH_YAXIS_TYPE_CALCULATED);
+ $yaxismin=@iif(isset($_REQUEST["yaxismin"]),$_REQUEST["yaxismin"],0.00);
+ $yaxismax=@iif(isset($_REQUEST["yaxismax"]),$_REQUEST["yaxismax"],100.00);
- if(isset($_GET["graphid"])&&!isset($_GET["name"]))
+ if(isset($_REQUEST["graphid"])&&!isset($_REQUEST["name"]))
{
- $result=DBselect("select g.graphid,g.name,g.width,g.height,g.yaxistype,g.yaxismin,g.yaxismax from graphs g where graphid=".$_GET["graphid"]);
+ $result=DBselect("select g.graphid,g.name,g.width,g.height,g.yaxistype,g.yaxismin,g.yaxismax from graphs g where graphid=".$_REQUEST["graphid"]);
$row=DBfetch($result);
$name=$row["name"];
$width=$row["width"];
@@ -1115,9 +1115,9 @@
show_table2_v_delimiter();
echo "<form method=\"get\" action=\"graphs.php\">";
- if(isset($_GET["graphid"]))
+ if(isset($_REQUEST["graphid"]))
{
- echo "<input class=\"biginput\" name=\"graphid\" type=\"hidden\" value=".$_GET["graphid"].">";
+ echo "<input class=\"biginput\" name=\"graphid\" type=\"hidden\" value=".$_REQUEST["graphid"].">";
}
echo S_NAME;
show_table2_h_delimiter();
@@ -1161,7 +1161,7 @@
show_table2_v_delimiter2();
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
- if(isset($_GET["graphid"]))
+ if(isset($_REQUEST["graphid"]))
{
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update\">";
echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete\" onClick=\"return Confirm('".S_DELETE_GRAPH_Q."');\">";
@@ -1195,7 +1195,7 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"config.php\">";
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
if(isset($escalationid))
{
echo "<input class=\"biginput\" name=\"escalationid\" type=\"hidden\" value=\"$escalationid\" size=8>";
@@ -1250,7 +1250,7 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"config.php\">";
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
echo "<input class=\"biginput\" name=\"escalationid\" type=\"hidden\" value=\"$escalationid\" size=8>";
if(isset($escalationruleid))
{
@@ -1342,9 +1342,9 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"hosts.php\">";
- if(isset($_GET["config"]))
+ if(isset($_REQUEST["config"]))
{
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
}
echo "<input class=\"biginput\" name=\"hostid\" type=\"hidden\" value=\"$hostid\" size=8>";
@@ -1447,7 +1447,7 @@
show_table2_v_delimiter($col++);
echo "<form method=\"get\" action=\"config.php\">";
- echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_GET["config"]."\" size=8>";
+ echo "<input class=\"biginput\" name=\"config\" type=\"hidden\" value=\"".$_REQUEST["config"]."\" size=8>";
if(isset($id))
{
echo "<input class=\"biginput\" name=\"id\" type=\"hidden\" value=\"$id\" size=8>";
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 1143683c..c72302e4 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -204,27 +204,27 @@
function navigation_bar_calc()
{
- if(!isset($_GET["period"])) $_GET["period"]=3600;
- if(!isset($_GET["from"])) $_GET["from"]=0;
+ if(!isset($_REQUEST["period"])) $_REQUEST["period"]=3600;
+ if(!isset($_REQUEST["from"])) $_REQUEST["from"]=0;
- if(isset($_GET["inc"])) $_GET["period"]= $_GET["period"]+$_GET["inc"];
- if(isset($_GET["dec"])) $_GET["period"]= $_GET["period"]-$_GET["dec"];
+ if(isset($_REQUEST["inc"])) $_REQUEST["period"]= $_REQUEST["period"]+$_REQUEST["inc"];
+ if(isset($_REQUEST["dec"])) $_REQUEST["period"]= $_REQUEST["period"]-$_REQUEST["dec"];
- if(isset($_GET["left"])) $_GET["from"]= $_GET["from"]+$_GET["left"];
- if(isset($_GET["right"])) $_GET["from"]= $_GET["from"]-$_GET["right"];
+ if(isset($_REQUEST["left"])) $_REQUEST["from"]= $_REQUEST["from"]+$_REQUEST["left"];
+ if(isset($_REQUEST["right"])) $_REQUEST["from"]= $_REQUEST["from"]-$_REQUEST["right"];
- unset($_GET["inc"]);
- unset($_GET["dec"]);
- unset($_GET["left"]);
- unset($_GET["right"]);
+ unset($_REQUEST["inc"]);
+ unset($_REQUEST["dec"]);
+ unset($_REQUEST["left"]);
+ unset($_REQUEST["right"]);
- if($_GET["from"]<=0) $_GET["from"]=0;
- if($_GET["period"]<=0) $_GET["period"]=3600;
+ if($_REQUEST["from"]<=0) $_REQUEST["from"]=0;
+ if($_REQUEST["period"]<=0) $_REQUEST["period"]=3600;
- if(isset($_GET["reset"]))
+ if(isset($_REQUEST["reset"]))
{
- $_GET["period"]=3600;
- $_GET["from"]=0;
+ $_REQUEST["period"]=3600;
+ $_REQUEST["from"]=0;
}
}
@@ -286,29 +286,29 @@
$h2=$h2."<input class=\"button\" type=\"submit\" name=\"action\" value=\"go\">";
$h2=$h2."<input class=\"button\" type=\"submit\" name=\"reset\" value=\"reset\">";
- if(isset($_GET["graphid"])&&($_GET["graphid"]!=0))
+ if(isset($_REQUEST["graphid"])&&($_REQUEST["graphid"]!=0))
{
- $h2=$h2."<input name=\"graphid\" type=\"hidden\" value=\"".$_GET["graphid"]."\" size=12>";
+ $h2=$h2."<input name=\"graphid\" type=\"hidden\" value=\"".$_REQUEST["graphid"]."\" size=12>";
}
- if(isset($_GET["screenid"])&&($_GET["screenid"]!=0))
+ if(isset($_REQUEST["screenid"])&&($_REQUEST["screenid"]!=0))
{
- $h2=$h2."<input name=\"screenid\" type=\"hidden\" value=\"".$_GET["screenid"]."\" size=12>";
+ $h2=$h2."<input name=\"screenid\" type=\"hidden\" value=\"".$_REQUEST["screenid"]."\" size=12>";
}
- if(isset($_GET["itemid"])&&($_GET["itemid"]!=0))
+ if(isset($_REQUEST["itemid"])&&($_REQUEST["itemid"]!=0))
{
- $h2=$h2."<input name=\"itemid\" type=\"hidden\" value=\"".$_GET["itemid"]."\" size=12>";
+ $h2=$h2."<input name=\"itemid\" type=\"hidden\" value=\"".$_REQUEST["itemid"]."\" size=12>";
}
- if(isset($_GET["action"]))
+ if(isset($_REQUEST["action"]))
{
- $h2=$h2."<input name=\"action\" type=\"hidden\" value=\"".$_GET["action"]."\" size=22>";
+ $h2=$h2."<input name=\"action\" type=\"hidden\" value=\"".$_REQUEST["action"]."\" size=22>";
}
- if(isset($_GET["from"]))
+ if(isset($_REQUEST["from"]))
{
- $h2=$h2."<input name=\"from\" type=\"hidden\" value=\"".$_GET["from"]."\" size=22>";
+ $h2=$h2."<input name=\"from\" type=\"hidden\" value=\"".$_REQUEST["from"]."\" size=22>";
}
- if(isset($_GET["fullscreen"]))
+ if(isset($_REQUEST["fullscreen"]))
{
- $h2=$h2."<input name=\"fullscreen\" type=\"hidden\" value=\"".$_GET["fullscreen"]."\" size=22>";
+ $h2=$h2."<input name=\"fullscreen\" type=\"hidden\" value=\"".$_REQUEST["fullscreen"]."\" size=22>";
}
show_header2($h1,$h2,"<form name=\"form2\" method=\"get\" action=\"$url\">","</form>");
@@ -329,9 +329,9 @@
foreach($a as $label=>$sec)
{
echo "[";
- if($_GET["period"]>$sec)
+ if($_REQUEST["period"]>$sec)
{
- $tmp=$_GET["period"]-$sec;
+ $tmp=$_REQUEST["period"]-$sec;
echo("<A HREF=\"$url&period=$tmp".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">-</A>");
}
else
@@ -342,7 +342,7 @@
echo("<A HREF=\"$url?period=$sec".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">");
echo($label."</A>");
- $tmp=$_GET["period"]+$sec;
+ $tmp=$_REQUEST["period"]+$sec;
echo("<A HREF=\"$url?period=$tmp".url_param("graphid").url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">+</A>");
echo "]&nbsp;";
@@ -353,7 +353,7 @@
echo "</TD>";
echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
echo "<b>".nbsp(S_KEEP_PERIOD).":</b>&nbsp;";
- if($_GET["keep"] == 1)
+ if($_REQUEST["keep"] == 1)
{
echo("[<A HREF=\"$url?keep=0".url_param("graphid").url_param("from").url_param("period").url_param("fullscreen")."\">".S_ON_C."</a>]");
}
@@ -365,7 +365,7 @@
echo "</TR>";
echo "<TR BGCOLOR=#FFFFFF>";
echo "<TD>";
- if(isset($_GET["stime"]))
+ if(isset($_REQUEST["stime"]))
{
echo "<div align=left>" ;
echo "<b>".S_MOVE.":</b>&nbsp;" ;
@@ -378,7 +378,7 @@
{
echo "[";
- $stime=$_GET["stime"];
+ $stime=$_REQUEST["stime"];
$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
$tmp=$tmp-3600*$hours;
$tmp=date("YmdHi",$tmp);
@@ -386,7 +386,7 @@
echo($label);
- $stime=$_GET["stime"];
+ $stime=$_REQUEST["stime"];
$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
$tmp=$tmp+3600*$hours;
$tmp=date("YmdHi",$tmp);
@@ -408,14 +408,14 @@
foreach($a as $label=>$hours)
{
echo "[";
- $tmp=$_GET["from"]+$hours;
+ $tmp=$_REQUEST["from"]+$hours;
echo("<A HREF=\"$url?from=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
echo($label);
- if($_GET["from"]>=$hours)
+ if($_REQUEST["from"]>=$hours)
{
- $tmp=$_GET["from"]-$hours;
+ $tmp=$_REQUEST["from"]-$hours;
echo("<A HREF=\"$url?from=$tmp".url_param("graphid").url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
}
else
@@ -430,11 +430,11 @@
echo "</TD>";
echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
echo "<form method=\"put\" action=\"$url\">";
- echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_GET["graphid"]."\" size=12>";
+ echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_REQUEST["graphid"]."\" size=12>";
echo "<input name=\"period\" type=\"hidden\" value=\"".(9*3600)."\" size=12>";
- if(isset($_GET["stime"]))
+ if(isset($_REQUEST["stime"]))
{
- echo "<input name=\"stime\" class=\"biginput\" value=\"".$_GET["stime"]."\" size=12>";
+ echo "<input name=\"stime\" class=\"biginput\" value=\"".$_REQUEST["stime"]."\" size=12>";
}
else
{
diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index 72c1c238..2016bef0 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -26,9 +26,9 @@
function form_select($var, $value, $label)
{
- global $_GET;
+ global $_REQUEST;
- return "<option value=\"$value\" ".iif(isset($_GET[$var])&&$_GET[$var]==$value,"selected","").">$label";
+ return "<option value=\"$value\" ".iif(isset($_REQUEST[$var])&&$_REQUEST[$var]==$value,"selected","").">$label";
}
function form_input($name, $value, $size)
@@ -43,11 +43,11 @@
function url1_param($parameter)
{
- global $_GET;
+ global $_REQUEST;
- if(isset($_GET[$parameter]))
+ if(isset($_REQUEST[$parameter]))
{
- return "$parameter=".$_GET[$parameter];
+ return "$parameter=".$_REQUEST[$parameter];
}
else
{
@@ -57,11 +57,11 @@
function url_param($parameter)
{
- global $_GET;
+ global $_REQUEST;
- if(isset($_GET[$parameter]))
+ if(isset($_REQUEST[$parameter]))
{
- return "&$parameter=".$_GET[$parameter];
+ return "&$parameter=".$_REQUEST[$parameter];
}
else
{