diff options
Diffstat (limited to 'frontends/php/slides.php')
| -rw-r--r-- | frontends/php/slides.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/frontends/php/slides.php b/frontends/php/slides.php index 5778b35d2a3..26f5cdf6fa4 100644 --- a/frontends/php/slides.php +++ b/frontends/php/slides.php @@ -42,15 +42,15 @@ $fields = array( 'step' => array(T_ZBX_INT, O_OPT, P_SYS, BETWEEN(0, 65535), null), 'period' => array(T_ZBX_INT, O_OPT, P_SYS, null, null), 'stime' => array(T_ZBX_STR, O_OPT, P_SYS, null, null), - 'reset' => array(T_ZBX_STR, O_OPT, P_SYS, IN("'reset'"), null), + 'reset' => array(T_ZBX_STR, O_OPT, P_SYS, IN('"reset"'), null), 'fullscreen' => array(T_ZBX_INT, O_OPT, P_SYS, IN('0,1'), null), // ajax - 'widgetRefresh' => array(T_ZBX_STR, O_OPT, P_ACT, null, null), + 'widgetRefresh' => array(T_ZBX_STR, O_OPT, null, null, null), 'widgetRefreshRate' => array(T_ZBX_STR, O_OPT, P_ACT, null, null), 'filterState' => array(T_ZBX_INT, O_OPT, P_ACT, null, null), 'favobj' => array(T_ZBX_STR, O_OPT, P_ACT, null, null), 'favid' => array(T_ZBX_INT, O_OPT, P_ACT, null, null), - 'favaction' => array(T_ZBX_STR, O_OPT, P_ACT, IN("'add','remove'"), null), + 'favaction' => array(T_ZBX_STR, O_OPT, P_ACT, IN('"add","remove"'), null), 'upd_counter' => array(T_ZBX_INT, O_OPT, P_ACT, null, null) ); check_fields($fields); @@ -60,8 +60,8 @@ check_fields($fields); */ $dbSlideshow = null; -if (hasRequest('groupid') && !API::HostGroup()->isReadable(array(getRequest('groupid'))) - || hasRequest('hostid') && !API::Host()->isReadable(array(getRequest('hostid')))) { +if (getRequest('groupid') && !API::HostGroup()->isReadable(array(getRequest('groupid'))) + || getRequest('hostid') && !API::Host()->isReadable(array(getRequest('hostid')))) { access_deny(); } if (hasRequest('elementid')) { @@ -100,6 +100,7 @@ if ((hasRequest('widgetRefresh') || hasRequest('widgetRefreshRate')) && $dbSlide 'mode' => SCREEN_MODE_PREVIEW, 'profileIdx' => 'web.slides', 'profileIdx2' => $elementId, + 'hostid' => getRequest('hostid'), 'period' => getRequest('period'), 'stime' => getRequest('stime') )); @@ -221,11 +222,14 @@ if ($data['screen']) { 'hosts' => array( 'monitored_hosts' => true, 'with_items' => true, - 'DDFirstLabel' => _('Default') + 'DDFirstLabel' => _('not selected') ), 'hostid' => getRequest('hostid'), 'groupid' => getRequest('groupid') )); + + $data['groupid'] = $data['pageFilter']->groupid; + $data['hostid'] = $data['pageFilter']->hostid; } // get element |