diff --git a/includes/arrays.php b/includes/arrays.php index 56c70c6..a441f80 100644 --- a/includes/arrays.php +++ b/includes/arrays.php @@ -268,9 +268,7 @@ $default_priority = LOG_WARNING; } -if (!isset($step)) { - $step = read_config_option('poller_interval'); -} +$step ??= read_config_option('poller_interval'); switch($step) { case '10': diff --git a/notify_lists.php b/notify_lists.php index 016e01d..c3e939a 100644 --- a/notify_lists.php +++ b/notify_lists.php @@ -842,7 +842,7 @@ function form_actions() { bottom_footer(); } else { - $save = ['post' => $_POST, 'selected_items' => isset($selected_items) ? $selected_items : '']; + $save = ['post' => $_POST, 'selected_items' => $selected_items ?? '']; api_plugin_hook_function('notify_list_form_confirm', $save); } } @@ -974,7 +974,7 @@ function edit() { draw_edit_form( [ 'config' => [], - 'fields' => inject_form_variables($fields_notification, (isset($list) ? $list : [])) + 'fields' => inject_form_variables($fields_notification, ($list ?? [])) ] ); @@ -1047,11 +1047,7 @@ function hosts($header_label) { // ================= input validation ================= // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); html_start_box(__('Associated Devices', 'thold') . ' ' . html_escape($header_label), '100%', false, '3', 'center', ''); @@ -1375,11 +1371,7 @@ function tholds($header_label) { } // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); $sql_where = ''; @@ -1724,11 +1716,7 @@ function templates($header_label) { thold_template_request_validation(); // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); $sql_where = ''; $sql_order = get_order_string(); @@ -2069,11 +2057,7 @@ function lists() { // ================= input validation ================= // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); html_start_box(__('Notification Lists', 'thold'), '100%', false, '3', 'center', 'notify_lists.php?action=edit'); diff --git a/thold.php b/thold.php index 0bf86f4..17b108d 100644 --- a/thold.php +++ b/thold.php @@ -585,11 +585,7 @@ function list_tholds() { include($config['base_path'] . '/plugins/thold/includes/arrays.php'); // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); top_header(); @@ -1617,7 +1613,7 @@ function thold_edit() { 'method' => '', 'default' => '', 'description' => __('Name of the Threshold Template the Threshold was created from.', 'thold'), - 'value' => isset($thold_data['template_name']) ? $thold_data['template_name'] : __('N/A', 'thold'), + 'value' => $thold_data['template_name'] ?? __('N/A', 'thold'), ], 'thold_enabled' => [ 'friendly_name' => __('Enabled at Template Level', 'thold'), @@ -1661,7 +1657,7 @@ function thold_edit() { 'method' => 'drop_color', 'none_value' => __('None', 'thold'), 'default' => '0', - 'value' => isset($thold_data['thold_hrule_warning']) ? $thold_data['thold_hrule_warning'] : '0' + 'value' => $thold_data['thold_hrule_warning'] ?? '0' ], 'thold_hrule_alert' => [ 'friendly_name' => __('Alert HRULE Color', 'thold'), @@ -1669,7 +1665,7 @@ function thold_edit() { 'method' => 'drop_color', 'none_value' => __('None', 'thold'), 'default' => '0', - 'value' => isset($thold_data['thold_hrule_alert']) ? $thold_data['thold_hrule_alert'] : '0' + 'value' => $thold_data['thold_hrule_alert'] ?? '0' ], 'graph_timespan' => [ 'friendly_name' => __('Graph Timespan'), @@ -1677,28 +1673,28 @@ function thold_edit() { 'default' => GT_LAST_DAY, 'description' => __('The Graph End time will be set at the time of triggering. The Graph Start time will be the End Time minus the Graph Timespan.'), 'array' => $graph_timespans, - 'value' => isset($thold_data['graph_timespan']) ? $thold_data['graph_timespan'] : '', + 'value' => $thold_data['graph_timespan'] ?? '', ], 'skipscale' => [ 'friendly_name' => __('Skip Scaling on HRULEs', 'thold'), 'method' => 'checkbox', 'default' => '', 'description' => __('If Checked, the Scale on the Graph will not be impacted by either the Alert or Warning HRULEs.', 'thold'), - 'value' => isset($thold_data['skipscale']) ? $thold_data['skipscale'] : '' + 'value' => $thold_data['skipscale'] ?? '' ], 'exempt' => [ 'friendly_name' => __('Weekend Exemption', 'thold'), 'description' => __('If this is checked, this Threshold will not alert on weekends.', 'thold'), 'method' => 'checkbox', 'default' => '', - 'value' => isset($thold_data['exempt']) ? $thold_data['exempt'] : '' + 'value' => $thold_data['exempt'] ?? '' ], 'restored_alert' => [ 'friendly_name' => __('Disable Restoration Email', 'thold'), 'description' => __('If this is checked, Threshold will not send an alert when the Threshold has returned to normal status.', 'thold'), 'method' => 'checkbox', 'default' => '', - 'value' => isset($thold_data['restored_alert']) ? $thold_data['restored_alert'] : '' + 'value' => $thold_data['restored_alert'] ?? '' ], 'acknowledgment' => [ 'friendly_name' => __('Acknowledgment Options'), @@ -1728,7 +1724,7 @@ function thold_edit() { 'array' => $thold_types, 'default' => read_config_option('thold_type'), 'description' => __('The type of Threshold that will be monitored.', 'thold'), - 'value' => isset($thold_data['thold_type']) ? $thold_data['thold_type'] : '' + 'value' => $thold_data['thold_type'] ?? '' ], 'repeat_alert' => [ 'friendly_name' => __('Re-Alert Cycle', 'thold'), @@ -1736,7 +1732,7 @@ function thold_edit() { 'array' => $repeatarray, 'default' => read_config_option('alert_repeat'), 'description' => __('Repeat alert after this amount of time has passed since the last alert.', 'thold'), - 'value' => isset($thold_data['repeat_alert']) ? $thold_data['repeat_alert'] : '' + 'value' => $thold_data['repeat_alert'] ?? '' ], 'thold_warning_header' => [ 'friendly_name' => __('Warning - High / Low Settings', 'thold'), @@ -1749,7 +1745,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_warning_hi']) ? $thold_data['thold_warning_hi'] : '' + 'value' => $thold_data['thold_warning_hi'] ?? '' ], 'thold_warning_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1757,14 +1753,14 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_warning_low']) ? $thold_data['thold_warning_low'] : '' + 'value' => $thold_data['thold_warning_low'] ?? '' ], 'thold_warning_fail_trigger' => [ 'friendly_name' => __('Breach Duration', 'thold'), 'method' => 'drop_array', 'array' => $alertarray, 'description' => __('The amount of time the Data Source must be in breach of the Threshold for a warning to be raised. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_warning_fail_trigger']) ? $thold_data['thold_warning_fail_trigger'] : read_config_option('alert_trigger') + 'value' => $thold_data['thold_warning_fail_trigger'] ?? read_config_option('alert_trigger') ], 'thold_header' => [ 'friendly_name' => __('Alert - High / Low Settings', 'thold'), @@ -1777,7 +1773,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_hi']) ? $thold_data['thold_hi'] : '' + 'value' => $thold_data['thold_hi'] ?? '' ], 'thold_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1785,14 +1781,14 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_low']) ? $thold_data['thold_low'] : '' + 'value' => $thold_data['thold_low'] ?? '' ], 'thold_fail_trigger' => [ 'friendly_name' => __('Breach Duration', 'thold'), 'method' => 'drop_array', 'array' => $alertarray, 'description' => __('The amount of time the Data Source must be in breach of the Threshold for an alert to be raised.', 'thold'), - 'value' => isset($thold_data['thold_fail_trigger']) ? $thold_data['thold_fail_trigger'] : read_config_option('alert_trigger') + 'value' => $thold_data['thold_fail_trigger'] ?? read_config_option('alert_trigger') ], 'time_warning_header' => [ 'friendly_name' => __('Warning - Time Based Settings', 'thold'), @@ -1805,7 +1801,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_warning_hi']) ? $thold_data['time_warning_hi'] : '' + 'value' => $thold_data['time_warning_hi'] ?? '' ], 'time_warning_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1813,7 +1809,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_warning_low']) ? $thold_data['time_warning_low'] : '' + 'value' => $thold_data['time_warning_low'] ?? '' ], 'time_warning_fail_trigger' => [ 'friendly_name' => __('Breach Count', 'thold'), @@ -1821,14 +1817,14 @@ function thold_edit() { 'max_length' => 5, 'size' => 15, 'description' => __('The number of times the Data Source must be in breach of the Threshold.', 'thold'), - 'value' => isset($thold_data['time_warning_fail_trigger']) ? $thold_data['time_warning_fail_trigger'] : read_config_option('thold_warning_time_fail_trigger') + 'value' => $thold_data['time_warning_fail_trigger'] ?? read_config_option('thold_warning_time_fail_trigger') ], 'time_warning_fail_length' => [ 'friendly_name' => __('Breach Window', 'thold'), 'method' => 'drop_array', 'array' => $timearray, 'description' => __('The amount of time in the past to check for Threshold breaches.', 'thold'), - 'value' => isset($thold_data['time_warning_fail_length']) ? $thold_data['time_warning_fail_length'] : (read_config_option('thold_warning_time_fail_length') > 0 ? read_config_option('thold_warning_time_fail_length') : 1) + 'value' => $thold_data['time_warning_fail_length'] ?? (read_config_option('thold_warning_time_fail_length') > 0 ? read_config_option('thold_warning_time_fail_length') : 1) ], 'time_header' => [ 'friendly_name' => __('Alert - Time Based Settings', 'thold'), @@ -1841,7 +1837,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_hi']) ? $thold_data['time_hi'] : '' + 'value' => $thold_data['time_hi'] ?? '' ], 'time_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1849,7 +1845,7 @@ function thold_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_low']) ? $thold_data['time_low'] : '' + 'value' => $thold_data['time_low'] ?? '' ], 'time_fail_trigger' => [ 'friendly_name' => __('Breach Count', 'thold'), @@ -1858,14 +1854,14 @@ function thold_edit() { 'size' => 15, 'default' => read_config_option('thold_time_fail_trigger'), 'description' => __('The number of times the Data Source must be in breach of the Threshold.', 'thold'), - 'value' => isset($thold_data['time_fail_trigger']) ? $thold_data['time_fail_trigger'] : read_config_option('thold_time_fail_trigger') + 'value' => $thold_data['time_fail_trigger'] ?? read_config_option('thold_time_fail_trigger') ], 'time_fail_length' => [ 'friendly_name' => __('Breach Window', 'thold'), 'method' => 'drop_array', 'array' => $timearray, 'description' => __('The amount of time in the past to check for Threshold breaches.', 'thold'), - 'value' => isset($thold_data['time_fail_length']) ? $thold_data['time_fail_length'] : (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_time_fail_length') : 1) + 'value' => $thold_data['time_fail_length'] ?? (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_time_fail_length') : 1) ], 'baseline_header' => [ 'friendly_name' => __('Baseline Settings', 'thold'), @@ -1877,7 +1873,7 @@ function thold_edit() { 'method' => 'drop_array', 'array' => $bl_types, 'description' => __('The type of Baseline. [TIP] is the Time in Past, [AOT] is the Average over Time. Percentage Deviation is a percentage value from the historical value. Absolute Value is a deviation either above or below the Baseline over that historical value. For the [TIP] Baseline Types, the MIN, MAX, AVG, and LAST will come from no more than a one day time period at that point in time.', 'thold'), - 'value' => isset($thold_data['bl_type']) ? $thold_data['bl_type'] : 0 + 'value' => $thold_data['bl_type'] ?? 0 ], 'bl_cf' => [ 'friendly_name' => __('Consolidation Function', 'thold'), @@ -1889,14 +1885,14 @@ function thold_edit() { 'LAST' => __('Last', 'thold'), ], 'description' => __('The Consolidation function to use for the Baseline Type value calculation.', 'thold'), - 'value' => isset($thold_data['bl_cf']) ? $thold_data['bl_cf'] : 'AVG' + 'value' => $thold_data['bl_cf'] ?? 'AVG' ], 'bl_ref_time_range' => [ 'friendly_name' => __('Time Range', 'thold'), 'method' => 'drop_array', 'array' => $thold_timespans, 'description' => __('Specifies the point in the past (based on rrd resolution) that will be used as a reference or the duration to use for the Floating Average when using the Floating Average type Threshold', 'thold'), - 'value' => isset($thold_data['bl_ref_time_range']) ? $thold_data['bl_ref_time_range'] : read_config_option('alert_bl_timerange_def') + 'value' => $thold_data['bl_ref_time_range'] ?? read_config_option('alert_bl_timerange_def') ], 'bl_pct_up' => [ 'friendly_name' => __('Deviation UP', 'thold'), @@ -1904,7 +1900,7 @@ function thold_edit() { 'max_length' => 12, 'size' => 15, 'description' => __('Specifies allowed deviation for the upper bound Threshold. If not set, the upper bound Threshold will not be checked at all. The unit of measure is an absolute values for \'Absolute Value\' Type, and a Percentable for both \'%% Deviation\' and \'%% Floating Average\'', 'thold'), - 'value' => isset($thold_data['bl_pct_up']) ? $thold_data['bl_pct_up'] : '' + 'value' => $thold_data['bl_pct_up'] ?? '' ], 'bl_pct_down' => [ 'friendly_name' => __('Deviation DOWN', 'thold'), @@ -1912,7 +1908,7 @@ function thold_edit() { 'max_length' => 12, 'size' => 15, 'description' => __('Specifies allowed deviation for the lower bound Threshold. If not set, the lower bound Threshold will not be checked at all. The unit of measure is an absolute values for \'Absolute Value\' Type, and a Percentable for both \'%% Deviation\' and \'%% Floating Average\'', 'thold'), - 'value' => isset($thold_data['bl_pct_down']) ? $thold_data['bl_pct_down'] : '' + 'value' => $thold_data['bl_pct_down'] ?? '' ], 'bl_fail_trigger' => [ 'friendly_name' => __('Trigger Count', 'thold'), @@ -1920,7 +1916,7 @@ function thold_edit() { 'max_length' => 3, 'size' => 15, 'description' => __('Number of consecutive times the Data Source must be in breach of the baseline Threshold for an alert to be raised.
Leave empty to use default value (Default: %s cycles)', read_config_option('alert_bl_trigger'), 'thold'), - 'value' => isset($thold_data['bl_fail_trigger']) ? $thold_data['bl_fail_trigger'] : read_config_option('alert_bl_trigger') + 'value' => $thold_data['bl_fail_trigger'] ?? read_config_option('alert_bl_trigger') ], 'data_manipulation' => [ 'friendly_name' => __('Data Manipulation', 'thold'), @@ -1933,14 +1929,14 @@ function thold_edit() { 'array' => $data_types, 'default' => read_config_option('data_type'), 'description' => __('Special formatting for the given data.', 'thold'), - 'value' => isset($thold_data['data_type']) ? $thold_data['data_type'] : '' + 'value' => $thold_data['data_type'] ?? '' ], 'cdef' => [ 'friendly_name' => __('Threshold CDEF'), 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Apply this CDEF before returning the data.'), - 'value' => isset($thold_data['cdef']) ? $thold_data['cdef'] : 0, + 'value' => $thold_data['cdef'] ?? 0, 'array' => thold_cdef_select_usable_names() ], 'percent_ds' => [ @@ -1948,7 +1944,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Second Data Source Item to use as total value to calculate percentage from.', 'thold'), - 'value' => isset($thold_data['percent_ds']) ? $thold_data['percent_ds'] : 0, + 'value' => $thold_data['percent_ds'] ?? 0, 'array' => $data_fields, ], 'show_units' => [ @@ -1965,14 +1961,14 @@ function thold_edit() { 'max_length' => 10, 'size' => 10, 'description' => __('If you wish to display a forced unit suffix on the various Threshold pages and Notifications, enter it here. The size is limited to no more than 10 characters.', 'thold'), - 'value' => isset($thold_data['units_suffix']) ? $thold_data['units_suffix'] : '' + 'value' => $thold_data['units_suffix'] ?? '' ], 'decimals' => [ 'friendly_name' => __('Decimal Digits to Display', 'thold'), 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('The number of decimal digits to display for Threshold and Current Values. The default is auto or 2.', 'thold'), - 'value' => isset($thold_data['decimals']) ? $thold_data['decimals'] : 0, + 'value' => $thold_data['decimals'] ?? 0, 'array' => $thold_decimal_digits, ], 'expression' => [ @@ -1982,7 +1978,7 @@ function thold_edit() { 'textarea_cols' => 80, 'default' => '', 'description' => __('An RPN Expression is an RRDtool Compatible RPN Expression. Syntax includes all functions below in addition to both Device and Data Query replacement expressions such as |query_ifSpeed|. To use a Data Source in the RPN Expression, you must use the syntax: |ds:dsname|. For example, |ds:traffic_in| will get the current value of the traffic_in Data Source for the RRDfile(s) associated with the Graph. Any Data Source for a Graph can be included.

Math Operators: +, -, /, *, %, ^
Functions: SIN, COS, TAN, ATAN, SQRT, FLOOR, CEIL, DEG2RAD, RAD2DEG, ABS, EXP, LOG, ATAN, ADNAN
Flow Operators: UN, ISINF, IF, LT, LE, GT, GE, EQ, NE
Comparison Functions: MAX, MIN, INF, NEGINF, NAN, UNKN, COUNT, PREV%s %s', $replacements, $datasources, 'thold'), - 'value' => isset($thold_data['expression']) ? $thold_data['expression'] : '', + 'value' => $thold_data['expression'] ?? '', 'max_length' => '255', 'size' => '80' ], @@ -1991,7 +1987,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Upper data source to calculate the total value.', 'thold'), - 'value' => isset($thold_data['upper_ds']) ? $thold_data['upper_ds'] : 0, + 'value' => $thold_data['upper_ds'] ?? 0, 'array' => $data_fields, ], 'notify_header' => [ @@ -2006,7 +2002,7 @@ function thold_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Email subject that will be displayed in the Email (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME> <LOCATION> <SITE>', 'thold'), - 'value' => isset($thold_data['email_subject']) ? $thold_data['email_subject'] : '' + 'value' => $thold_data['email_subject'] ?? '' ], 'email_body' => [ 'friendly_name' => __('Alert Body', 'thold'), @@ -2015,7 +2011,7 @@ function thold_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_alert_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold Alerts (1024 Char MAX). HTML is allowed, but will be removed for text only emails. There are several common replacement tags that may be used in include:
eg. <DESCRIPTION> <HOSTNAME> <LOCATION> <SITE> <TIME> <DATE> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <HI> <LOW> <DURATION> <TRIGGER> <DETAILS_URL> <DATE_RFC822> <BREACHED_ITEMS>', 'thold'), - 'value' => isset($thold_data['email_body']) ? $thold_data['email_body'] : '' + 'value' => $thold_data['email_body'] ?? '' ], 'email_subject_warn' => [ 'friendly_name' => __('Warning Subject', 'thold'), @@ -2024,7 +2020,7 @@ function thold_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Warning Email subject that will be displayed in the Email after change to Warning (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME> <LOCATION> <SITE>', 'thold'), - 'value' => isset($thold_data['email_subject']) ? $thold_data['email_subject'] : '' + 'value' => $thold_data['email_subject'] ?? '' ], 'email_body_warn' => [ 'friendly_name' => __('Warning Body', 'thold'), @@ -2033,7 +2029,7 @@ function thold_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_warning_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold Warnings (1024 Char MAX). HTML is allowed, but will be removed for text only emails. There are several common replacement tags that may be used in include:
eg. <DESCRIPTION> <HOSTNAME> <LOCATION> <SITE> <TIME> <DATE> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <HI> <LOW> <DURATION> <TRIGGER> <DETAILS_URL> <DATE_RFC822> <BREACHED_ITEMS>', 'thold'), - 'value' => isset($thold_data['email_body_warn']) ? $thold_data['email_body_warn'] : '' + 'value' => $thold_data['email_body_warn'] ?? '' ], 'email_subject_restoral' => [ 'friendly_name' => __('Restoral Subject', 'thold'), @@ -2042,7 +2038,7 @@ function thold_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Email subject that will be displayed in the Email after a Restoral to Normal (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME> <LOCATION> <SITE>', 'thold'), - 'value' => isset($thold_data['email_subject_restoral']) ? $thold_data['email_subject_restoral'] : '' + 'value' => $thold_data['email_subject_restoral'] ?? '' ], 'email_body_restoral' => [ 'friendly_name' => __('Restoral Email Body', 'thold'), @@ -2051,13 +2047,13 @@ function thold_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_restoral_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold restoral notifications (1024 Chars MAX). HTML is allowed, but will be removed for text only Emails. There are several common replacement tags that may be used in include:
<DESCRIPTION> <HOSTNAME> <LOCATION> <SITE> <HOST_ID> <TIME> <DATE> <DATE_RFC822> <BREACHED_ITEMS> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <NOTES> <DNOTES>', 'thold'), - 'value' => isset($thold_data['email_body_restoral']) ? $thold_data['email_body_restoral'] : '' + 'value' => $thold_data['email_body_restoral'] ?? '' ], 'notify_warning' => [ 'friendly_name' => __('Warning Notification List', 'thold'), 'method' => 'drop_sql', 'description' => __('You may specify choose a Notification List to receive Warnings for this Data Source', 'thold'), - 'value' => isset($thold_data['notify_warning']) ? $thold_data['notify_warning'] : '', + 'value' => $thold_data['notify_warning'] ?? '', 'none_value' => __('None', 'thold'), 'sql' => 'SELECT id, name FROM plugin_notification_lists ORDER BY name' ], @@ -2065,7 +2061,7 @@ function thold_edit() { 'friendly_name' => __('Alert Notification List', 'thold'), 'method' => 'drop_sql', 'description' => __('You may specify choose a Notification List to receive Alerts for this Data Source', 'thold'), - 'value' => isset($thold_data['notify_alert']) ? $thold_data['notify_alert'] : '', + 'value' => $thold_data['notify_alert'] ?? '', 'none_value' => __('None', 'thold'), 'sql' => 'SELECT id, name FROM plugin_notification_lists ORDER BY name' ], @@ -2074,7 +2070,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => 'default.format', 'description' => __('Choose the custom html wrapper and CSS file to use. This file contains both html and CSS to wrap around your report. If it contains more than simply CSS, you need to place a special tag inside of the file. This format tag will be replaced by the report content. These files are located in the \'formats\' directory.', 'thold'), - 'value' => isset($thold_data['format_file']) ? $thold_data['format_file'] : '', + 'value' => $thold_data['format_file'] ?? '', 'array' => $formats ], ]; @@ -2085,7 +2081,7 @@ function thold_edit() { 'friendly_name' => __('SNMP Notification - Event Category', 'thold'), 'method' => 'textbox', 'description' => __('To allow a NMS to categorize different SNMP notifications more easily please fill in the category SNMP notifications for this template should make use of. E.g.: "disk_usage", "link_utilization", "ping_test", "nokia_firewall_cpu_utilization" ...', 'thold'), - 'value' => isset($thold_data['snmp_event_category']) ? $thold_data['snmp_event_category'] : '', + 'value' => $thold_data['snmp_event_category'] ?? '', 'default' => '', 'max_length' => '255', ], @@ -2096,7 +2092,7 @@ function thold_edit() { 'class' => 'textAreaNotes', 'textarea_rows' => '5', 'textarea_cols' => '80', - 'value' => isset($thold_data['snmp_event_description']) ? $thold_data['snmp_event_description'] : '', + 'value' => $thold_data['snmp_event_description'] ?? '', 'default' => '', ], 'snmp_event_severity' => [ @@ -2104,7 +2100,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => '3', 'description' => __('Severity to be used for alerts. (low impact -> critical impact)', 'thold'), - 'value' => isset($thold_data['snmp_event_severity']) ? $thold_data['snmp_event_severity'] : 3, + 'value' => $thold_data['snmp_event_severity'] ?? 3, 'array' => [ 1 => __('Low', 'thold'), 2 => __('Medium', 'thold'), @@ -2123,7 +2119,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => '2', 'description' => __('Severity to be used for warnings. (Low impact -> Critical impact).
Note: The severity of warnings has to be equal or lower than the severity being defined for alerts.', 'thold'), - 'value' => isset($thold_data['snmp_event_warning_severity']) ? $thold_data['snmp_event_warning_severity'] : 2, + 'value' => $thold_data['snmp_event_warning_severity'] ?? 2, 'array' => [ 1 => __('Low', 'thold'), 2 => __('Medium', 'thold'), @@ -2152,7 +2148,7 @@ function thold_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('You may specify here extra Emails to receive alerts for this data source (comma separated)', 'thold'), - 'value' => isset($thold_data['notify_extra']) ? $thold_data['notify_extra'] : '' + 'value' => $thold_data['notify_extra'] ?? '' ], 'notify_warning_extra' => [ 'friendly_name' => __('Warning Emails', 'thold'), @@ -2160,7 +2156,7 @@ function thold_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('You may specify here extra Emails to receive warnings for this data source (comma separated)', 'thold'), - 'value' => isset($thold_data['notify_warning_extra']) ? $thold_data['notify_warning_extra'] : '' + 'value' => $thold_data['notify_warning_extra'] ?? '' ] ]; @@ -2173,11 +2169,11 @@ function thold_edit() { ], 'notify_extra' => [ 'method' => 'hidden', - 'value' => isset($thold_data['notify_extra']) ? $thold_data['notify_extra'] : '' + 'value' => $thold_data['notify_extra'] ?? '' ], 'notify_warning_extra' => [ 'method' => 'hidden', - 'value' => isset($thold_data['notify_warning_extra']) ? $thold_data['notify_warning_extra'] : '' + 'value' => $thold_data['notify_warning_extra'] ?? '' ] ]; @@ -2196,7 +2192,7 @@ function thold_edit() { 'description' => __('If checked, Threshold notification will be sent to your local syslog.', 'thold'), 'method' => 'checkbox', 'default' => read_config_option('alert_syslog'), - 'value' => isset($thold_data['syslog_enabled']) ? $thold_data['syslog_enabled'] : '' + 'value' => $thold_data['syslog_enabled'] ?? '' ], 'syslog_priority' => [ 'friendly_name' => __('Priority/Level', 'thold'), @@ -2204,7 +2200,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => read_config_option('thold_syslog_priority'), 'array' => $syslog_priority_array, - 'value' => isset($thold_data['syslog_priority']) ? $thold_data['syslog_priority'] : '' + 'value' => $thold_data['syslog_priority'] ?? '' ], 'syslog_facility' => [ 'friendly_name' => __('Facility', 'thold'), @@ -2212,7 +2208,7 @@ function thold_edit() { 'method' => 'drop_array', 'default' => read_config_option('thold_syslog_facility'), 'array' => $syslog_facil_array, - 'value' => isset($thold_data['syslog_facility']) ? $thold_data['syslog_facility'] : '' + 'value' => $thold_data['syslog_facility'] ?? '' ] ]; } else { @@ -2239,7 +2235,7 @@ function thold_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_high']) ? $thold_data['trigger_cmd_high'] : '' + 'value' => $thold_data['trigger_cmd_high'] ?? '' ], 'trigger_cmd_low' => [ 'friendly_name' => __('Low Trigger Command', 'thold'), @@ -2247,7 +2243,7 @@ function thold_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_low']) ? $thold_data['trigger_cmd_low'] : '' + 'value' => $thold_data['trigger_cmd_low'] ?? '' ], 'trigger_cmd_norm' => [ 'friendly_name' => __('Norm Trigger Command', 'thold'), @@ -2255,7 +2251,7 @@ function thold_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_norm']) ? $thold_data['trigger_cmd_norm'] : '' + 'value' => $thold_data['trigger_cmd_norm'] ?? '' ], ]; @@ -2272,7 +2268,7 @@ function thold_edit() { 'friendly_name' => __('External ID', 'thold'), 'method' => 'textbox', 'description' => __('Enter an Eternal ID for this Threshold.', 'thold'), - 'value' => isset($thold_data['external_id']) ? $thold_data['external_id'] : '', + 'value' => $thold_data['external_id'] ?? '', 'default' => '', 'size' => '20', 'max_length' => '20', @@ -2283,7 +2279,7 @@ function thold_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('Enter instructions here for an operator who may be receiving the Threshold message.', 'thold'), - 'value' => isset($thold_data['notes']) ? $thold_data['notes'] : '' + 'value' => $thold_data['notes'] ?? '' ] ]; @@ -2320,7 +2316,7 @@ function thold_edit() { html_end_box(); - form_save_button(isset($_SESSION['data_return']) ? $_SESSION['data_return'] : 'thold.php' . (!empty($thold_data['id']) ? '?id=' . $thold_data['id'] : ''), 'return', 'id'); + form_save_button($_SESSION['data_return'] ?? 'thold.php' . (!empty($thold_data['id']) ? '?id=' . $thold_data['id'] : ''), 'return', 'id'); ?> diff --git a/thold_functions.php b/thold_functions.php index fc100b8..c7d761a 100644 --- a/thold_functions.php +++ b/thold_functions.php @@ -54,6 +54,25 @@ * * @return - the sanitized search string */ + +/** + * plugin_get_rows_per_page - resolve rows-per-page from request vars + * + * @return int + */ +function plugin_get_rows_per_page() { + $rows = get_request_var('rows'); + + if ($rows == -1) { + return read_config_option('num_rows_table'); + } elseif ($rows == -2) { + return 999999; + } + + return $rows; +} + + function sanitize_thold_sort_string($string) { static $drop_char_match = ['^', '$', '<', '>', '`', '\'', '"', '|', '?', '+', '[', ']', '{', '}', '#', ';', '!', '=', '*']; static $drop_char_replace = [' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ']; @@ -1997,11 +2016,11 @@ function plugin_thold_log_changes($id, $changed, $message = []) { switch ($message['thold_type']) { case 0: - $desc .= ' High[' . (isset($message['thold_hi']) ? $message['thold_hi'] : '') . ']'; - $desc .= ' Low[' . (isset($message['thold_low']) ? $message['thold_low'] : '') . ']'; - $desc .= ' Trigger[' . plugin_thold_duration_convert($thold['data_template_id'], (isset($message['thold_fail_trigger']) ? $message['thold_fail_trigger'] : ''), 'alert', 'data_template_id') . ']'; - $desc .= ' WarnHigh[' . (isset($message['thold_warning_hi']) ? $message['thold_warning_hi'] : '') . ']'; - $desc .= ' WarnLow[' . (isset($message['thold_warning_low']) ? $message['thold_warning_low'] : '') . ']'; + $desc .= ' High[' . ($message['thold_hi'] ?? '') . ']'; + $desc .= ' Low[' . ($message['thold_low'] ?? '') . ']'; + $desc .= ' Trigger[' . plugin_thold_duration_convert($thold['data_template_id'], ($message['thold_fail_trigger'] ?? ''), 'alert', 'data_template_id') . ']'; + $desc .= ' WarnHigh[' . ($message['thold_warning_hi'] ?? '') . ']'; + $desc .= ' WarnLow[' . ($message['thold_warning_low'] ?? '') . ']'; $desc .= ' WarnTrigger[' . plugin_thold_duration_convert($thold['data_template_id'], (isset($message['thold_warning_fail_trigger']) ? $message['thold_fail_trigger'] : ''), 'alert', 'data_template_id') . ']'; break; @@ -2013,8 +2032,8 @@ function plugin_thold_log_changes($id, $changed, $message = []) { } $desc .= ' Range[' . $message['bl_ref_time_range'] . ']'; - $desc .= ' DevUp[' . (isset($message['bl_pct_up']) ? $message['bl_pct_up'] : '') . ']'; - $desc .= ' DevDown[' . (isset($message['bl_pct_down']) ? $message['bl_pct_down'] : '') . ']'; + $desc .= ' DevUp[' . ($message['bl_pct_up'] ?? '') . ']'; + $desc .= ' DevDown[' . ($message['bl_pct_down'] ?? '') . ']'; $desc .= ' Trigger[' . $message['bl_fail_trigger'] . ']'; break; @@ -2031,7 +2050,7 @@ function plugin_thold_log_changes($id, $changed, $message = []) { break; } - $desc .= ' CDEF[' . (isset($message['cdef']) ? $message['cdef'] : '') . ']'; + $desc .= ' CDEF[' . ($message['cdef'] ?? '') . ']'; $desc .= ' ReAlert[' . plugin_thold_duration_convert($thold['data_template_id'], $message['repeat_alert'], 'alert', 'data_template_id') . ']'; $desc .= ' AlertEmails[' . $alert_emails . ']'; $desc .= ' WarnEmails[' . $warning_emails . ']'; @@ -3694,9 +3713,7 @@ function get_email_subject($phase, $trigger, $lastread, $ra, $breach_up, &$thold break; } - if (!isset($value)) { - $value = $thold_data['lastread']; - } + $value ??= $thold_data['lastread']; if ($phase == 'NORMAL') { if ($thold_data['email_subject_restoral'] == '' || $peralert == '') { @@ -3866,7 +3883,7 @@ function get_thold_snmp_data($data_source_name, $thold, $h, $currentval) { $snmp_event_description = thold_str_replace('', $thold_snmp_data['eventSource'], $snmp_event_description); $snmp_event_description = thold_str_replace('', $thold_snmp_data['eventDevice'], $snmp_event_description); $snmp_event_description = thold_str_replace('', ($thold['thold_template_id'] ? $thold['thold_template_id'] : 'none'), $snmp_event_description); - $snmp_event_description = thold_str_replace('', (isset($thold['name_cache']) ? $thold['name_cache'] : 'none'), $snmp_event_description); + $snmp_event_description = thold_str_replace('', ($thold['name_cache'] ?? 'none'), $snmp_event_description); $snmp_event_description = thold_str_replace('', $thold_snmp_data['eventThresholdType'], $snmp_event_description); $snmp_event_description = thold_str_replace('', $thold_snmp_data['eventDataSource'], $snmp_event_description); $snmp_event_description = thold_str_replace('', $thold_snmp_data['eventHigh'], $snmp_event_description); @@ -5161,11 +5178,11 @@ function thold_check_baseline($local_data_id, $data_source_name, $current_value, if ($debug) { print 'Local Data Id: ' . $local_data_id . ':' . $thold_data['data_template_rrd_id'] . "\n"; print 'Ref. values count: ' . (isset($ref_values) ? count($ref_values) : 'N/A') . "\n"; - print 'Ref. value (min): ' . (isset($ref_value_min) ? $ref_value_min : 'N/A') . "\n"; - print 'Ref. value (max): ' . (isset($ref_value_max) ? $ref_value_max : 'N/A') . "\n"; + print 'Ref. value (min): ' . ($ref_value_min ?? 'N/A') . "\n"; + print 'Ref. value (max): ' . ($ref_value_max ?? 'N/A') . "\n"; print 'Cur. value: ' . $current_value . "\n"; - print 'Low bl thresh: ' . (isset($blt_low) ? $blt_low : 'N/A') . "\n"; - print 'High bl thresh: ' . (isset($blt_high) ? $blt_high : 'N/A') . "\n"; + print 'Low bl thresh: ' . ($blt_low ?? 'N/A') . "\n"; + print 'High bl thresh: ' . ($blt_high ?? 'N/A') . "\n"; print 'Check against baseline: '; switch($failed) { @@ -6760,7 +6777,7 @@ function thold_mail($to_email, $bcc_email, $from_email, $subject, $message, $fil 'attachments' => empty($attachments) ? null : $attachments, 'headers' => $headers, 'html' => $thold_send_text_only != 'on', - 'id' => (isset($host['thold_id']) ? $host['thold_id'] : $host['id']) + 'id' => ($host['thold_id'] ?? $host['id']) ]; thold_notification_add($topic, $data, 'id', $notify_list_id, $host); @@ -6795,7 +6812,7 @@ function thold_mail($to_email, $bcc_email, $from_email, $subject, $message, $fil 'attachments' => empty($attachments) ? '' : $attachments, 'headers' => $headers, 'html' => $thold_send_text_only != 'on', - 'id' => (isset($host['thold_id']) ? $host['thold_id'] : $host['id']) + 'id' => ($host['thold_id'] ?? $host['id']) ]; thold_notification_add($topic, $data, 'id', $notify_list_id, $host); diff --git a/thold_graph.php b/thold_graph.php index 619f2ee..6125733 100644 --- a/thold_graph.php +++ b/thold_graph.php @@ -922,11 +922,7 @@ function hosts() { // ================= input validation ================= // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); html_start_box(__('Device Status', 'thold'), '100%', false, '3', 'center', ''); form_host_filter(); @@ -1426,11 +1422,7 @@ function thold_show_log() { thold_validate_log_vars(); // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); $days = read_config_option('thold_log_storage'); diff --git a/thold_templates.php b/thold_templates.php index ea379ef..fb08e69 100644 --- a/thold_templates.php +++ b/thold_templates.php @@ -1151,7 +1151,7 @@ function template_edit() { 'size' => '60', 'default' => thold_get_default_template_name($thold_data), 'description' => __('Provide the Threshold Template a meaningful name.', 'thold'), - 'value' => isset($thold_data['name']) ? $thold_data['name'] : '' + 'value' => $thold_data['name'] ?? '' ], 'suggested_name' => [ 'friendly_name' => __('Suggested Threshold Name', 'thold'), @@ -1160,7 +1160,7 @@ function template_edit() { 'size' => '60', 'default' => thold_get_default_suggested_name($thold_data), 'description' => __('Provide the suggested name for a Threshold created using this Template. Standard Device (|host_*|), Data Query (|query_*|) and Input (|input_*|) substitution variables can be used as well as |graph_title| for the Graph Title.', 'thold'), - 'value' => isset($thold_data['suggested_name']) ? $thold_data['suggested_name'] : '' + 'value' => $thold_data['suggested_name'] ?? '' ], 'data_template_name' => [ 'friendly_name' => __('Data Template', 'thold'), @@ -1183,7 +1183,7 @@ function template_edit() { 'method' => 'checkbox', 'default' => 'on', 'description' => __('Whether or not this Threshold will be checked and alerted upon.', 'thold'), - 'value' => isset($thold_data['thold_enabled']) ? $thold_data['thold_enabled'] : '' + 'value' => $thold_data['thold_enabled'] ?? '' ], 'thold_hrule_warning' => [ 'friendly_name' => __('Warning HRULE Color', 'thold'), @@ -1191,7 +1191,7 @@ function template_edit() { 'method' => 'drop_color', 'none_value' => __('None', 'thold'), 'default' => '0', - 'value' => isset($thold_data['thold_hrule_warning']) ? $thold_data['thold_hrule_warning'] : '0' + 'value' => $thold_data['thold_hrule_warning'] ?? '0' ], 'thold_hrule_alert' => [ 'friendly_name' => __('Alert HRULE Color', 'thold'), @@ -1199,7 +1199,7 @@ function template_edit() { 'method' => 'drop_color', 'none_value' => __('None', 'thold'), 'default' => '0', - 'value' => isset($thold_data['thold_hrule_alert']) ? $thold_data['thold_hrule_alert'] : '0' + 'value' => $thold_data['thold_hrule_alert'] ?? '0' ], 'graph_timespan' => [ 'friendly_name' => __('Graph Timespan'), @@ -1214,21 +1214,21 @@ function template_edit() { 'method' => 'checkbox', 'default' => '', 'description' => __('If Checked, the Scale on the Graph will not be impacted by either the Alert or Warning HRULEs.', 'thold'), - 'value' => isset($thold_data['skipscale']) ? $thold_data['skipscale'] : '' + 'value' => $thold_data['skipscale'] ?? '' ], 'exempt' => [ 'friendly_name' => __('Weekend Exemption', 'thold'), 'description' => __('If this is checked, this Threshold will not alert on weekends.', 'thold'), 'method' => 'checkbox', 'default' => '', - 'value' => isset($thold_data['exempt']) ? $thold_data['exempt'] : '' + 'value' => $thold_data['exempt'] ?? '' ], 'restored_alert' => [ 'friendly_name' => __('Disable Restoration Email', 'thold'), 'description' => __('If this is checked, Threshold will not send an alert when the Threshold has returned to normal status.', 'thold'), 'method' => 'checkbox', 'default' => '', - 'value' => isset($thold_data['restored_alert']) ? $thold_data['restored_alert'] : '' + 'value' => $thold_data['restored_alert'] ?? '' ], 'acknowledgment' => [ 'friendly_name' => __('Acknowledgment Options'), @@ -1258,7 +1258,7 @@ function template_edit() { 'array' => $thold_types, 'default' => read_config_option('thold_type'), 'description' => __('The type of Threshold that will be monitored.', 'thold'), - 'value' => isset($thold_data['thold_type']) ? $thold_data['thold_type'] : '' + 'value' => $thold_data['thold_type'] ?? '' ], 'repeat_alert' => [ 'friendly_name' => __('Re-Alert Cycle', 'thold'), @@ -1266,7 +1266,7 @@ function template_edit() { 'array' => $repeatarray, 'default' => read_config_option('alert_repeat'), 'description' => __('Repeat alert after this amount of time has pasted since the last alert.', 'thold'), - 'value' => isset($thold_data['repeat_alert']) ? $thold_data['repeat_alert'] : '' + 'value' => $thold_data['repeat_alert'] ?? '' ], 'thold_warning_header' => [ 'friendly_name' => __('Warning - High / Low Settings', 'thold'), @@ -1279,7 +1279,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_warning_hi']) ? $thold_data['thold_warning_hi'] : '' + 'value' => $thold_data['thold_warning_hi'] ?? '' ], 'thold_warning_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1287,14 +1287,14 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_warning_low']) ? $thold_data['thold_warning_low'] : '' + 'value' => $thold_data['thold_warning_low'] ?? '' ], 'thold_warning_fail_trigger' => [ 'friendly_name' => __('Min Trigger Duration', 'thold'), 'method' => 'drop_array', 'array' => $alertarray, 'description' => __('The amount of time the Data Source must be in a breach condition for an alert to be raised.', 'thold'), - 'value' => isset($thold_data['thold_warning_fail_trigger']) ? $thold_data['thold_warning_fail_trigger'] : read_config_option('alert_trigger') + 'value' => $thold_data['thold_warning_fail_trigger'] ?? read_config_option('alert_trigger') ], 'thold_header' => [ 'friendly_name' => __('Alert - High / Low Settings', 'thold'), @@ -1307,7 +1307,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_hi']) ? $thold_data['thold_hi'] : '' + 'value' => $thold_data['thold_hi'] ?? '' ], 'thold_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1315,14 +1315,14 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['thold_low']) ? $thold_data['thold_low'] : '' + 'value' => $thold_data['thold_low'] ?? '' ], 'thold_fail_trigger' => [ 'friendly_name' => __('Min Trigger Duration', 'thold'), 'method' => 'drop_array', 'array' => $alertarray, 'description' => __('The amount of time the Data Source must be in a breach condition for an alert to be raised.', 'thold'), - 'value' => isset($thold_data['thold_fail_trigger']) ? $thold_data['thold_fail_trigger'] : read_config_option('alert_trigger') + 'value' => $thold_data['thold_fail_trigger'] ?? read_config_option('alert_trigger') ], 'time_warning_header' => [ 'friendly_name' => __('Warning - Time Based Settings', 'thold'), @@ -1335,7 +1335,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_warning_hi']) ? $thold_data['time_warning_hi'] : '' + 'value' => $thold_data['time_warning_hi'] ?? '' ], 'time_warning_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1343,7 +1343,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, warning will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_warning_low']) ? $thold_data['time_warning_low'] : '' + 'value' => $thold_data['time_warning_low'] ?? '' ], 'time_warning_fail_trigger' => [ 'friendly_name' => __('Trigger Count', 'thold'), @@ -1352,14 +1352,14 @@ function template_edit() { 'size' => 15, 'default' => read_config_option('thold_warning_time_fail_trigger'), 'description' => __('The number of times the Data Source must be in breach condition prior to issuing a warning.', 'thold'), - 'value' => isset($thold_data['time_warning_fail_trigger']) ? $thold_data['time_warning_fail_trigger'] : read_config_option('alert_trigger') + 'value' => $thold_data['time_warning_fail_trigger'] ?? read_config_option('alert_trigger') ], 'time_warning_fail_length' => [ 'friendly_name' => __('Time Period Length', 'thold'), 'method' => 'drop_array', 'array' => $timearray, 'description' => __('The amount of time in the past to check for Threshold breaches.', 'thold'), - 'value' => isset($thold_data['time_warning_fail_length']) ? $thold_data['time_warning_fail_length'] : (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_warning_time_fail_length') : 1) + 'value' => $thold_data['time_warning_fail_length'] ?? (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_warning_time_fail_length') : 1) ], 'time_header' => [ 'friendly_name' => __('Alert - Time Based Settings', 'thold'), @@ -1372,7 +1372,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes above this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_hi']) ? $thold_data['time_hi'] : '' + 'value' => $thold_data['time_hi'] ?? '' ], 'time_low' => [ 'friendly_name' => __('Low Threshold', 'thold'), @@ -1380,7 +1380,7 @@ function template_edit() { 'max_length' => 100, 'size' => 15, 'description' => __('If set and Data Source value goes below this number, alert will be triggered. NOTE: This value must be a RAW number. The value displayed on the Graph may be modified by a cdef.', 'thold'), - 'value' => isset($thold_data['time_low']) ? $thold_data['time_low'] : '' + 'value' => $thold_data['time_low'] ?? '' ], 'time_fail_trigger' => [ 'friendly_name' => __('Trigger Count', 'thold'), @@ -1388,14 +1388,14 @@ function template_edit() { 'max_length' => 5, 'size' => 15, 'description' => __('The number of times the Data Source must be in breach condition prior to issuing an alert.', 'thold'), - 'value' => isset($thold_data['time_fail_trigger']) ? $thold_data['time_fail_trigger'] : read_config_option('thold_time_fail_trigger') + 'value' => $thold_data['time_fail_trigger'] ?? read_config_option('thold_time_fail_trigger') ], 'time_fail_length' => [ 'friendly_name' => __('Time Period Length', 'thold'), 'method' => 'drop_array', 'array' => $timearray, 'description' => __('The amount of time in the past to check for Threshold breaches.', 'thold'), - 'value' => isset($thold_data['time_fail_length']) ? $thold_data['time_fail_length'] : (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_time_fail_length') : 2) + 'value' => $thold_data['time_fail_length'] ?? (read_config_option('thold_time_fail_length') > 0 ? read_config_option('thold_time_fail_length') : 2) ], 'baseline_header' => [ 'friendly_name' => __('Baseline Monitoring', 'thold'), @@ -1407,7 +1407,7 @@ function template_edit() { 'method' => 'drop_array', 'array' => $bl_types, 'description' => __('The type of Baseline. [TIP] is the Time in Past, [AOT] is the Average over Time. Percentage Deviation is a percentage value from the historical value. Absolute Value is a deviation either above or below the Baseline over that historical value. For the [TIP] Baseline Types, the MIN, MAX, AVG, and LAST will come from no more than a one day time period at that point in time.', 'thold'), - 'value' => isset($thold_data['bl_type']) ? $thold_data['bl_type'] : 0 + 'value' => $thold_data['bl_type'] ?? 0 ], 'bl_cf' => [ 'friendly_name' => __('Consolidation Function', 'thold'), @@ -1419,14 +1419,14 @@ function template_edit() { 'LAST' => __('Last', 'thold'), ], 'description' => __('The Consolidation function to use for the Baseline Type value calculation.', 'thold'), - 'value' => isset($thold_data['bl_cf']) ? $thold_data['bl_cf'] : 'AVG' + 'value' => $thold_data['bl_cf'] ?? 'AVG' ], 'bl_ref_time_range' => [ 'friendly_name' => __('Time Range', 'thold'), 'method' => 'drop_array', 'array' => $thold_timespans, 'description' => __('Specifies the point in the past (based on rrd resolution) that will be used as a reference or the duration to use for the Floating Average when using the Floating Average type Threshold', 'thold'), - 'value' => isset($thold_data['bl_ref_time_range']) ? $thold_data['bl_ref_time_range'] : read_config_option('alert_bl_timerange_def') + 'value' => $thold_data['bl_ref_time_range'] ?? read_config_option('alert_bl_timerange_def') ], 'bl_pct_up' => [ 'friendly_name' => __('Deviation UP', 'thold'), @@ -1434,7 +1434,7 @@ function template_edit() { 'max_length' => 12, 'size' => 15, 'description' => __('Specifies allowed deviation for the upper bound Threshold. If not set, upper bound Threshold will not be checked at all. The unit of measure is an absolute values for \'Absolute Value\' Type, and a Percentable for both \'%% Deviation\' and \'%% Floating Average\'', 'thold'), - 'value' => isset($thold_data['bl_pct_up']) ? $thold_data['bl_pct_up'] : read_config_option('alert_bl_percent_def') + 'value' => $thold_data['bl_pct_up'] ?? read_config_option('alert_bl_percent_def') ], 'bl_pct_down' => [ 'friendly_name' => __('Deviation DOWN', 'thold'), @@ -1442,7 +1442,7 @@ function template_edit() { 'max_length' => 12, 'size' => 15, 'description' => __('Specifies allowed deviation for the lower bound Threshold. If not set, lower bound Threshold will not be checked at all. The unit of measure is an absolute values for \'Absolute Value\' Type, and a Percentable for both \'%% Deviation\' and \'%% Floating Average\'', 'thold'), - 'value' => isset($thold_data['bl_pct_down']) ? $thold_data['bl_pct_down'] : read_config_option('alert_bl_percent_def') + 'value' => $thold_data['bl_pct_down'] ?? read_config_option('alert_bl_percent_def') ], 'bl_fail_trigger' => [ 'friendly_name' => __('Trigger Count', 'thold'), @@ -1450,7 +1450,7 @@ function template_edit() { 'max_length' => 3, 'size' => 15, 'description' => __('Number of consecutive times the Data Source must be in a breached condition for an alert to be raised.
Leave empty to use default value (Default: %s cycles', read_config_option('alert_bl_trigger'), 'thold'), - 'value' => isset($thold_data['bl_fail_trigger']) ? $thold_data['bl_fail_trigger'] : read_config_option('alert_bl_trigger') + 'value' => $thold_data['bl_fail_trigger'] ?? read_config_option('alert_bl_trigger') ], 'data_manipulation' => [ 'friendly_name' => __('Data Manipulation', 'thold'), @@ -1462,14 +1462,14 @@ function template_edit() { 'on_change' => 'changeDataType()', 'array' => $data_types, 'description' => __('Special formatting for the given data.', 'thold'), - 'value' => isset($thold_data['data_type']) ? $thold_data['data_type'] : read_config_option('data_type') + 'value' => $thold_data['data_type'] ?? read_config_option('data_type') ], 'cdef' => [ 'friendly_name' => __('Threshold CDEF', 'thold'), 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Apply this CDEF before returning the data.', 'thold'), - 'value' => isset($thold_data['cdef']) ? $thold_data['cdef'] : 0, + 'value' => $thold_data['cdef'] ?? 0, 'array' => thold_cdef_select_usable_names() ], 'percent_ds' => [ @@ -1477,7 +1477,7 @@ function template_edit() { 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Second Datasource Item to use as total value to calculate percentage from.', 'thold'), - 'value' => isset($thold_data['percent_ds']) ? $thold_data['percent_ds'] : 0, + 'value' => $thold_data['percent_ds'] ?? 0, 'array' => $data_fields2, ], 'expression' => [ @@ -1487,14 +1487,14 @@ function template_edit() { 'textarea_cols' => 80, 'default' => '', 'description' => __('An RPN Expression is an RRDtool Compatible RPN Expression. Syntax includes all functions below in addition to both Device and Data Query replacement expressions such as |query_ifSpeed|. To use a Data Source in the RPN Expression, you must use the syntax: |ds:dsname|. For example, |ds:traffic_in| will get the current value of the traffic_in Data Source for the RRDfile(s) associated with the Graph. Any Data Source for a Graph can be included.
Math Operators: +, -, /, *, %, ^
Functions: SIN, COS, TAN, ATAN, SQRT, FLOOR, CEIL, DEG2RAD, RAD2DEG, ABS, EXP, LOG, ATAN, ADNAN
Flow Operators: UN, ISINF, IF, LT, LE, GT, GE, EQ, NE
Comparison Functions: MAX, MIN, INF, NEGINF, NAN, UNKN, COUNT, PREV%s %s', $replacements, $datasources, 'thold'), - 'value' => isset($thold_data['expression']) ? $thold_data['expression'] : '' + 'value' => $thold_data['expression'] ?? '' ], 'upper_ds' => [ 'friendly_name' => __('Upper Data Source', 'thold'), 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('Upper data source to use to calculate the total value.', 'thold'), - 'value' => isset($thold_data['upper_ds']) ? $thold_data['upper_ds'] : 0, + 'value' => $thold_data['upper_ds'] ?? 0, 'array' => $data_fields2, ], 'show_units' => [ @@ -1502,7 +1502,7 @@ function template_edit() { 'method' => 'checkbox', 'default' => '', 'description' => __('Display units for very large or small numbers.', 'thold'), - 'value' => isset($thold_data['show_units']) ? $thold_data['show_units'] : '' + 'value' => $thold_data['show_units'] ?? '' ], 'units_suffix' => [ 'friendly_name' => __('Force Units Suffix', 'thold'), @@ -1511,14 +1511,14 @@ function template_edit() { 'max_length' => 10, 'size' => 10, 'description' => __('If you wish to display a forced unit suffix on the various Threshold pages and Notifications, enter it here. The size is limited to no more than 10 characters.', 'thold'), - 'value' => isset($thold_data['units_suffix']) ? $thold_data['units_suffix'] : '' + 'value' => $thold_data['units_suffix'] ?? '' ], 'decimals' => [ 'friendly_name' => __('Decimal Digits to Display', 'thold'), 'method' => 'drop_array', 'default' => 'NULL', 'description' => __('The number of decimal digits to display for Threshold and Current Values. The default is auto or 2.', 'thold'), - 'value' => isset($thold_data['decimals']) ? $thold_data['decimals'] : 0, + 'value' => $thold_data['decimals'] ?? 0, 'array' => $thold_decimal_digits, ], 'notify_header' => [ @@ -1533,7 +1533,7 @@ function template_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Email subject that will be displayed in the Email (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME>', 'thold'), - 'value' => isset($thold_data['email_subject']) ? $thold_data['email_subject'] : '' + 'value' => $thold_data['email_subject'] ?? '' ], 'email_body' => [ 'friendly_name' => __('Alert Email Body', 'thold'), @@ -1542,7 +1542,7 @@ function template_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_alert_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold Alerts (1024 Char MAX). HTML is allowed, but will be removed for text only emails. There are several common replacement tags that may be used in include:
eg. <DESCRIPTION> <HOSTNAME> <TIME> <DATE> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <HI> <LOW> <DURATION> <TRIGGER> <DETAILS_URL> <DATE_RFC822> <BREACHED_ITEMS>', 'thold'), - 'value' => isset($thold_data['email_body']) ? $thold_data['email_body'] : '' + 'value' => $thold_data['email_body'] ?? '' ], 'email_subject_warn' => [ 'friendly_name' => __('Warning Subject', 'thold'), @@ -1551,7 +1551,7 @@ function template_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Warning subject that will be displayed in the Email (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME>', 'thold'), - 'value' => isset($thold_data['email_subject']) ? $thold_data['email_subject'] : '' + 'value' => $thold_data['email_subject'] ?? '' ], 'email_body_warn' => [ 'friendly_name' => __('Warning Body', 'thold'), @@ -1560,7 +1560,7 @@ function template_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_warning_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold Warnings (1024 Char MAX). HTML is allowed, but will be removed for text only emails. There are several common replacement tags that may be used in include:
eg. <DESCRIPTION> <HOSTNAME> <TIME> <DATE> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <HI> <LOW> <DURATION> <TRIGGER> <DETAILS_URL> <DATE_RFC822> <BREACHED_ITEMS>', 'thold'), - 'value' => isset($thold_data['email_body_warn']) ? $thold_data['email_body_warn'] : '' + 'value' => $thold_data['email_body_warn'] ?? '' ], 'email_subject_restoral' => [ 'friendly_name' => __('Restoral Subject', 'thold'), @@ -1569,7 +1569,7 @@ function template_edit() { 'size' => 80, 'max_length' => 128, 'description' => __('This is the Email subject that will be displayed in the Email after a Restoral to Normal (128 Char MAX). Leave blank for the default. There are several common replacement tags that may be used in include:
<PHASE> <THRESHOLDVALUE> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <BREACHUP> <REALERT> <HOSTNAME>', 'thold'), - 'value' => isset($thold_data['email_subject_restoral']) ? $thold_data['email_subject_restoral'] : '' + 'value' => $thold_data['email_subject_restoral'] ?? '' ], 'email_body_restoral' => [ 'friendly_name' => __('Restoral Body', 'thold'), @@ -1578,20 +1578,20 @@ function template_edit() { 'textarea_cols' => 50, 'default' => read_config_option('thold_restoral_text'), 'description' => __('This is the message that will be displayed at the top of all Threshold restoral notifications (1024 Chars MAX). HTML is allowed, but will be removed for text only Emails. There are several common replacement tags that may be used in include:
<DESCRIPTION> <HOSTNAME> <HOST_ID> <TIME> <DATE> <DATE_RFC822> <BREACHED_ITEMS> <URL> <GRAPHID> <CURRENTVALUE> <THRESHOLDNAME> <DSNAME> <SUBJECT> <GRAPH> <NOTES> <DNOTES>', 'thold'), - 'value' => isset($thold_data['email_body_restoral']) ? $thold_data['email_body_restoral'] : '' + 'value' => $thold_data['email_body_restoral'] ?? '' ], 'notify_templated' => [ 'friendly_name' => __('Notification List Read Only', 'thold'), 'description' => __('If checked, Threshold Notification Lists in the Template will overwrite those of the Threshold.', 'thold'), 'method' => 'checkbox', 'default' => read_config_option('notify_templated'), - 'value' => isset($thold_data['notify_templated']) ? $thold_data['notify_templated'] : '' + 'value' => $thold_data['notify_templated'] ?? '' ], 'notify_warning' => [ 'friendly_name' => __('Warning Notification List', 'thold'), 'method' => 'drop_sql', 'description' => __('You may specify choose a Notification List to receive Warnings for this Data Source', 'thold'), - 'value' => isset($thold_data['notify_warning']) ? $thold_data['notify_warning'] : '', + 'value' => $thold_data['notify_warning'] ?? '', 'none_value' => __('None', 'thold'), 'sql' => 'SELECT id, name FROM plugin_notification_lists ORDER BY name' ], @@ -1599,7 +1599,7 @@ function template_edit() { 'friendly_name' => __('Alert Notification List', 'thold'), 'method' => 'drop_sql', 'description' => __('You may specify choose a Notification List to receive Alerts for this Data Source', 'thold'), - 'value' => isset($thold_data['notify_alert']) ? $thold_data['notify_alert'] : '', + 'value' => $thold_data['notify_alert'] ?? '', 'none_value' => __('None', 'thold'), 'sql' => 'SELECT id, name FROM plugin_notification_lists ORDER BY name' ], @@ -1619,7 +1619,7 @@ function template_edit() { 'friendly_name' => __('SNMP Notification - Event Category', 'thold'), 'method' => 'textbox', 'description' => __('To allow a NMS to categorize different SNMP notifications more easily please fill in the category SNMP notifications for this template should make use of. E.g.: "disk_usage", "link_utilization", "ping_test", "nokia_firewall_cpu_utilization" ...', 'thold'), - 'value' => isset($thold_data['snmp_event_category']) ? $thold_data['snmp_event_category'] : '', + 'value' => $thold_data['snmp_event_category'] ?? '', 'default' => '', 'max_length' => '255', ], @@ -1630,7 +1630,7 @@ function template_edit() { 'class' => 'textAreaNotes', 'textarea_rows' => '5', 'textarea_cols' => '80', - 'value' => isset($thold_data['snmp_event_description']) ? $thold_data['snmp_event_description'] : '', + 'value' => $thold_data['snmp_event_description'] ?? '', 'default' => '', ], 'snmp_event_severity' => [ @@ -1638,7 +1638,7 @@ function template_edit() { 'method' => 'drop_array', 'default' => '3', 'description' => __('Severity to be used for alerts. (Low impact -> Critical impact)', 'thold'), - 'value' => isset($thold_data['snmp_event_severity']) ? $thold_data['snmp_event_severity'] : 3, + 'value' => $thold_data['snmp_event_severity'] ?? 3, 'array' => [1 => __('Low', 'thold'), 2 => __('Medium', 'thold'), 3 => __('High', 'thold'), 4 => __('Critical', 'thold')], ], ]; @@ -1652,7 +1652,7 @@ function template_edit() { 'method' => 'drop_array', 'default' => '2', 'description' => __('Severity to be used for warnings. (Low impact -> Critical impact).
Note: The severity of warnings has to be equal or lower than the severity being defined for alerts.', 'thold'), - 'value' => isset($thold_data['snmp_event_warning_severity']) ? $thold_data['snmp_event_warning_severity'] : 2, + 'value' => $thold_data['snmp_event_warning_severity'] ?? 2, 'array' => [1 => __('Low', 'thold'), 2 => __('Medium', 'thold'), 3 => __('High', 'thold'), 4 => __('Critical', 'thold')], ], ]; @@ -1669,7 +1669,7 @@ function template_edit() { 'description' => __('This is a listing of accounts that will be notified when this Threshold is breached.



', 'thold'), 'array' => $send_notification_array, 'sql' => $sql, - 'value' => isset($thold_data['notify_accounts']) ? $thold_data['notify_accounts'] : '' + 'value' => $thold_data['notify_accounts'] ?? '' ], 'notify_extra' => [ 'friendly_name' => __('Alert Emails', 'thold'), @@ -1677,7 +1677,7 @@ function template_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('You may specify here extra Emails to receive alerts for this Data Source (comma separated)', 'thold'), - 'value' => isset($thold_data['notify_extra']) ? $thold_data['notify_extra'] : '' + 'value' => $thold_data['notify_extra'] ?? '' ], 'notify_warning_extra' => [ 'friendly_name' => __('Warning Emails', 'thold'), @@ -1685,7 +1685,7 @@ function template_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('You may specify here extra Emails to receive warnings for this Data Source (comma separated)', 'thold'), - 'value' => isset($thold_data['notify_warning_extra']) ? $thold_data['notify_warning_extra'] : '' + 'value' => $thold_data['notify_warning_extra'] ?? '' ] ]; @@ -1698,11 +1698,11 @@ function template_edit() { ], 'notify_extra' => [ 'method' => 'hidden', - 'value' => isset($thold_data['notify_extra']) ? $thold_data['notify_extra'] : '' + 'value' => $thold_data['notify_extra'] ?? '' ], 'notify_warning_extra' => [ 'method' => 'hidden', - 'value' => isset($thold_data['notify_warning_extra']) ? $thold_data['notify_warning_extra'] : '' + 'value' => $thold_data['notify_warning_extra'] ?? '' ] ]; @@ -1721,7 +1721,7 @@ function template_edit() { 'description' => __('If checked, Threshold notification will be sent to your local syslog.', 'thold'), 'method' => 'checkbox', 'default' => read_config_option('alert_syslog'), - 'value' => isset($thold_data['syslog_enabled']) ? $thold_data['syslog_enabled'] : '' + 'value' => $thold_data['syslog_enabled'] ?? '' ], 'syslog_priority' => [ 'friendly_name' => __('Priority/Level', 'thold'), @@ -1729,7 +1729,7 @@ function template_edit() { 'method' => 'drop_array', 'default' => read_config_option('thold_syslog_priority'), 'array' => $syslog_priority_array, - 'value' => isset($thold_data['syslog_priority']) ? $thold_data['syslog_priority'] : '' + 'value' => $thold_data['syslog_priority'] ?? '' ], 'syslog_facility' => [ 'friendly_name' => __('Facility', 'thold'), @@ -1737,7 +1737,7 @@ function template_edit() { 'method' => 'drop_array', 'default' => read_config_option('thold_syslog_facility'), 'array' => $syslog_facil_array, - 'value' => isset($thold_data['syslog_facility']) ? $thold_data['syslog_facility'] : '' + 'value' => $thold_data['syslog_facility'] ?? '' ] ]; } else { @@ -1764,7 +1764,7 @@ function template_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_high']) ? $thold_data['trigger_cmd_high'] : '' + 'value' => $thold_data['trigger_cmd_high'] ?? '' ], 'trigger_cmd_low' => [ 'friendly_name' => __('Low Trigger Command', 'thold'), @@ -1772,7 +1772,7 @@ function template_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_low']) ? $thold_data['trigger_cmd_low'] : '' + 'value' => $thold_data['trigger_cmd_low'] ?? '' ], 'trigger_cmd_norm' => [ 'friendly_name' => __('Norm Trigger Command', 'thold'), @@ -1780,7 +1780,7 @@ function template_edit() { 'method' => 'textarea', 'textarea_rows' => '4', 'textarea_cols' => '80', - 'value' => isset($thold_data['trigger_cmd_norm']) ? $thold_data['trigger_cmd_norm'] : '' + 'value' => $thold_data['trigger_cmd_norm'] ?? '' ], ]; @@ -1797,7 +1797,7 @@ function template_edit() { 'friendly_name' => __('External ID', 'thold'), 'method' => 'textbox', 'description' => __('Enter an Eternal ID for this Thold Template.', 'thold'), - 'value' => isset($thold_data['external_id']) ? $thold_data['external_id'] : '', + 'value' => $thold_data['external_id'] ?? '', 'default' => '', 'size' => '20', 'max_length' => '20', @@ -1808,7 +1808,7 @@ function template_edit() { 'textarea_rows' => 3, 'textarea_cols' => 50, 'description' => __('Enter instructions here for an operator who may be receiving the Threshold message.', 'thold'), - 'value' => isset($thold_data['notes']) ? $thold_data['notes'] : '' + 'value' => $thold_data['notes'] ?? '' ] ]; @@ -1821,7 +1821,7 @@ function template_edit() { ], 'data_template_id' => [ 'method' => 'hidden', - 'value' => (isset($thold_data['data_template_id']) ? $thold_data['data_template_id'] : '0') + 'value' => ($thold_data['data_template_id'] ?? '0') ], 'data_source_id' => [ 'method' => 'hidden', @@ -2133,11 +2133,7 @@ function templates() { template_request_validation(); // if the number of rows is -1, set it to the default - if (get_request_var('rows') == -1) { - $rows = read_config_option('num_rows_table'); - } else { - $rows = get_request_var('rows'); - } + $rows = plugin_get_rows_per_page(); html_start_box(__('Threshold Templates', 'thold'), '100%', false, '3', 'center', 'thold_templates.php?action=add');