diff options
Diffstat (limited to 'frontends/php/include/classes')
| -rw-r--r-- | frontends/php/include/classes/chelp.inc.php | 15 | ||||
| -rw-r--r-- | frontends/php/include/classes/ctag.inc.php | 4 | ||||
| -rw-r--r-- | frontends/php/include/classes/ctriggerinfo.mod.php | 2 |
3 files changed, 16 insertions, 5 deletions
diff --git a/frontends/php/include/classes/chelp.inc.php b/frontends/php/include/classes/chelp.inc.php index 310c3286..0f11ab19 100644 --- a/frontends/php/include/classes/chelp.inc.php +++ b/frontends/php/include/classes/chelp.inc.php @@ -22,10 +22,21 @@ class CHelp extends CLink { /* public */ - function CHelp($url="index.php") + function CHelp($url="index.php",$side=null) { + if(is_null($side)) $side = 'right'; + if($side == 'right') + { + $pside = 'left'; + } + else + { + $side = 'left'; + $pside = 'right'; + } + parent::CLink(new CImg('images/general/help.gif','?'), 'http://www.zabbix.com/manual/v1.1/'.$url); - $this->options['style'] = 'float:right'; + $this->options['style'] = 'padding-'.$pside.': 5px; float:'.$side; $this->options['target'] = '_blank'; } } diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php index df7d91ae..70decbfc 100644 --- a/frontends/php/include/classes/ctag.inc.php +++ b/frontends/php/include/classes/ctag.inc.php @@ -218,7 +218,7 @@ { insert_showhint_javascript(); - $text = addslashes(htmlspecialchars($text)); + $text = addslashes(htmlspecialchars(unpack_object($text))); if($width != '' || $class!= '') { $code = "show_hint_ext(this,event,'".$text."','".$width."','".$class."');"; @@ -229,7 +229,7 @@ } $this->AddAction('onMouseOver', $code); - $this->AddAction('onMouseMove', $code); + $this->AddAction('onMouseMove', 'update_hint(this,event);'); } function OnClick($handle_code) diff --git a/frontends/php/include/classes/ctriggerinfo.mod.php b/frontends/php/include/classes/ctriggerinfo.mod.php index 89481990..0f9c4b20 100644 --- a/frontends/php/include/classes/ctriggerinfo.mod.php +++ b/frontends/php/include/classes/ctriggerinfo.mod.php @@ -70,7 +70,7 @@ " and i.status=".ITEM_STATUS_ACTIVE. ' and h.hostid in ('.get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY, null, null, $this->nodeid).') '. - " group by priority"); + " group by priority,t.value"); while($row=DBfetch($db_priority)) { switch($row["value"]) |