summaryrefslogtreecommitdiffstats
path: root/frontends/php/include/html.inc.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-12-05 12:15:43 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-12-05 12:15:43 +0000
commit3265938a7cd0ef277bfc550ff47b60ed71b417de (patch)
tree308a9561fd97e3a2b449d5a36ad33f9db3552fbd /frontends/php/include/html.inc.php
parentf65cf979409619d9de7174926e51c995f145017a (diff)
downloadzabbix-3265938a7cd0ef277bfc550ff47b60ed71b417de.tar.gz
zabbix-3265938a7cd0ef277bfc550ff47b60ed71b417de.tar.xz
zabbix-3265938a7cd0ef277bfc550ff47b60ed71b417de.zip
- improved editing of graphs (Eugene)
- developed 'Color picker' (Eugene) git-svn-id: svn://svn.zabbix.com/trunk@3567 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/html.inc.php')
-rw-r--r--frontends/php/include/html.inc.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index 2a57bb43..66b5a741 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -92,7 +92,9 @@
if(is_array($var))
{
foreach($var as $id => $par)
- $result .= prepare_url($par,$varname."[".$id."]");
+ $result .= prepare_url($par,
+ isset($varname) ? $varname."[".$id."]": $id
+ );
}
else
{
@@ -103,11 +105,19 @@
function url_param($parameter,$request=true,$name=null)
{
- if(!$request && !isset($name)) fatal_error('not request variable require url name [url_param]');
-
$result = "";
- if(!isset($name)) $name = $parameter;
+
+ if(!is_array($parameter))
+ {
+ if(!isset($name))
+ {
+ if(!$request)
+ fatal_error('not request variable require url name [url_param]');
+
+ $name = $parameter;
+ }
+ }
if($request)
{