diff options
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/php/include/scripts.inc.php | 6 | ||||
| -rw-r--r-- | frontends/php/tr_status.php | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/frontends/php/include/scripts.inc.php b/frontends/php/include/scripts.inc.php index edbd853e..8ff9018e 100644 --- a/frontends/php/include/scripts.inc.php +++ b/frontends/php/include/scripts.inc.php @@ -85,7 +85,11 @@ function get_accessible_scripts_by_hosts($hosts){ $hosts_read_only = explode(',',get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid())); $hosts_read_write = explode(',',get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,null,null,get_current_nodeid())); - $scripts_by_host = array(); +// initialize array + foreach($hosts as $id => $hostid){ + $scripts_by_host[$hostid] = array(); + } +//----- $sql = 'SELECT * FROM scripts '. ' WHERE '.DBin_node('scriptid'). diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php index 500700b0..f586df6a 100644 --- a/frontends/php/tr_status.php +++ b/frontends/php/tr_status.php @@ -485,9 +485,11 @@ include_once "include/page_header.php"; $host = null; if($_REQUEST['hostid'] < 1){ $menus = ''; + foreach($scripts_by_hosts[$row['hostid']] as $id => $script){ $menus.= "['".$script['name']."',\"javascript: openWinCentered('scripts_exec.php?execute=1&hostid=".$row['hostid']."&scriptid=".$script['scriptid']."','".S_TOOLS."',760,540,'titlebar=no, resizable=yes, scrollbars=yes, dialog=no');\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; } + $menus = trim($menus,','); if(!empty($menus)) $menus="show_popup_menu(event,[[".zbx_jsvalue(S_TOOLS).",null,null,{'outer' : ['pum_oheader'],'inner' : ['pum_iheader']}],".$menus."],180);"; |