diff options
Diffstat (limited to 'src/usr/local/www/status_logs_common.inc')
-rw-r--r-- | src/usr/local/www/status_logs_common.inc | 66 |
1 files changed, 53 insertions, 13 deletions
diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index c3f6a83..1e4a930 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -63,6 +63,7 @@ require_once("filter_log.inc"); // Status Logs Common - Code function status_logs_common_code() { global $g, $config, $specific_log, $nentries, $filterlogentries_qty, $logfile_path, $shortcut_section, $allowed_logs, $logfile; + global $system_logs_filter_form_hidden, $system_logs_manage_log_form_hidden, $view; $logfile_path = "{$g['varlog_path']}/" . basename($logfile) . ".log"; @@ -86,6 +87,15 @@ function status_logs_common_code() { if (!empty($allowed_logs[$logfile]["shortcut"])) { $shortcut_section = $allowed_logs[$logfile]["shortcut"]; } + + // Get the configured options for Show/Hide Log Filter and Manage Log panels. + $system_logs_filter_form_hidden = isset($config['system']['webgui']['systemlogsfilterpanel']) ? false : true; + $system_logs_manage_log_form_hidden = isset($config['system']['webgui']['systemlogsmanagelogpanel']) ? false : true; + + if ($logfile == 'filter' && $view == 'summary') { + $system_logs_filter_form_hidden = false; + $system_logs_manage_log_form_hidden = false; + } } // Tab Array @@ -176,17 +186,26 @@ function log_filter_form_system_submit() { function filter_form_system() { global $filter_active, $rawfilter, $filterfieldsarray, $filtertext, $filterlogentries_qty, $nentries, $Include_Act, $interfacefilter; + global $system_logs_filter_form_hidden; if ($filter_active) { - $filter_state = SEC_OPEN; + $panel_state = 'in'; + $panel_body_state = SEC_OPEN; } else { - $filter_state = SEC_CLOSED; + if ($system_logs_filter_form_hidden) { + $panel_state = 'out'; + $panel_body_state = SEC_OPEN; + } else { + $panel_state = 'in'; + $panel_body_state = SEC_CLOSED; + } } if (!$rawfilter) { // Advanced log filter form $form = new Form(false); + $form->setAttribute('id', 'filter-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section('Advanced Log Filter', 'adv-filter-panel', COLLAPSIBLE|$filter_state); + $section = new Form_Section('Advanced Log Filter', 'filter-panel', COLLAPSIBLE|$panel_body_state); $group = new Form_Group(''); @@ -238,8 +257,9 @@ function filter_form_system() { ); } else { // Simple log filter form $form = new Form(false); + $form->setAttribute('id', 'filter-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section('Log Filter', 'basic-filter-panel', COLLAPSIBLE|$filter_state); + $section = new Form_Section('Log Filter', 'filter-panel', COLLAPSIBLE|$panel_body_state); $group = new Form_Group(''); @@ -322,6 +342,7 @@ function log_filter_form_firewall_submit() { function filter_form_firewall() { global $filter_active, $rawfilter, $filterfieldsarray, $filtertext, $filterlogentries_qty, $nentries, $interfacefilter; + global $system_logs_filter_form_hidden; $Include_Act = explode(",", str_replace(" ", ",", $filterfieldsarray['act'])); if ($filterfieldsarray['interface'] == "All") { @@ -329,15 +350,23 @@ function filter_form_firewall() { } if ($filter_active) { - $filter_state = SEC_OPEN; + $panel_state = 'in'; + $panel_body_state = SEC_OPEN; } else { - $filter_state = SEC_CLOSED; + if ($system_logs_filter_form_hidden) { + $panel_state = 'out'; + $panel_body_state = SEC_OPEN; + } else { + $panel_state = 'in'; + $panel_body_state = SEC_CLOSED; + } } if (!$rawfilter) { // Advanced log filter form $form = new Form(false); + $form->setAttribute('id', 'filter-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section('Advanced Log Filter', 'adv-filter-panel', COLLAPSIBLE|$filter_state); + $section = new Form_Section('Advanced Log Filter', 'filter-panel', COLLAPSIBLE|$panel_body_state); $group = new Form_Group(''); @@ -436,8 +465,9 @@ function filter_form_firewall() { ); } else { // Simple log filter form $form = new Form(false); + $form->setAttribute('id', 'filter-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section('Log Filter', 'basic-filter-panel', COLLAPSIBLE|$filter_state); + $section = new Form_Section('Log Filter', 'filter-panel', COLLAPSIBLE|$panel_body_state); $group = new Form_Group(''); @@ -700,20 +730,30 @@ function manage_log_code() { function manage_log_section() { global $input_errors, $allowed_logs, $logfile, $config, $pconfig; + global $system_logs_manage_log_form_hidden; if ($input_errors) { print_input_errors($input_errors); $manage_log_active = true; } - if ($manage_log_active) - $manage_log_state = SEC_OPEN; - else - $manage_log_state = SEC_CLOSED; + if ($filter_active) { + $panel_state = 'in'; + $panel_body_state = SEC_OPEN; + } else { + if ($system_logs_manage_log_form_hidden) { + $panel_state = 'out'; + $panel_body_state = SEC_OPEN; + } else { + $panel_state = 'in'; + $panel_body_state = SEC_CLOSED; + } + } $form = new Form(false); + $form->setAttribute('id', 'manage-log-form')->addClass('collapse ' . $panel_state); - $section = new Form_Section(gettext('Manage') . ' ' . gettext($allowed_logs[$logfile]["name"]) . ' ' . gettext('Log'), 'log-manager-panel', COLLAPSIBLE|$manage_log_state); + $section = new Form_Section(gettext('Manage') . ' ' . gettext($allowed_logs[$logfile]["name"]) . ' ' . gettext('Log'), 'manage-log-panel', COLLAPSIBLE|$panel_body_state); $section->addInput(new Form_StaticText( '', |