diff --git a/database.php b/database.php index 29beeef..8079af5 100644 --- a/database.php +++ b/database.php @@ -1,4 +1,6 @@ $removed, 'xferred' => $xferred); + return ['removed' => $removed, 'xferred' => $xferred]; } /** function syslog_log_row_color() @@ -690,7 +692,7 @@ function sql_hosts_where($tab) { $hostfilter = ''; $hostfilter_log = ''; - $hosts_array = array(); + $hosts_array = []; if (!isempty_request_var('host') && get_nfilter_request_var('host') != 'null') { $hostarray = explode(',', trim(get_nfilter_request_var('host'))); @@ -702,7 +704,7 @@ function sql_hosts_where($tab) { $log_host = syslog_db_fetch_cell_prepared('SELECT host FROM `' . $syslogdb_default . '`.`syslog_hosts` WHERE host_id = ?', - array($host_id)); + [$host_id]); if (!empty($log_host)) { $hosts_array[] = db_qstr($log_host); @@ -836,7 +838,7 @@ function syslog_debug($message) { } } -function syslog_log_alert($alert_id, $alert_name, $severity, $msg, $count = 1, $html = '', $hosts = array()) { +function syslog_log_alert($alert_id, $alert_name, $severity, $msg, $count = 1, $html = '', $hosts = []) { global $config, $severities; global $syslogdb_default; @@ -1023,7 +1025,7 @@ function syslog_manage_items($from_table, $to_table) { } } - return array('removed' => $removed, 'xferred' => $xferred); + return ['removed' => $removed, 'xferred' => $xferred]; } /* get_hash_syslog - returns the current unique hash for an alert @@ -1033,7 +1035,7 @@ function get_hash_syslog($id, $table) { $hash = syslog_db_fetch_cell_prepared('SELECT hash FROM ' . $table . ' WHERE id = ?', - array($id)); + [$id]); if (empty($hash)) { return generate_hash(); @@ -1049,7 +1051,7 @@ function syslog_ia2xml($array) { if (cacti_sizeof($array)) { foreach ($array as $key=>$value) { - if (is_array($value)) { + if (is_[$value]) { $xml .= "\t<$key>" . syslog_ia2xml($value) . "\n"; } else { $xml .= "\t<$key>" . html_escape($value) . "\n"; @@ -1098,7 +1100,7 @@ function syslog_execute_ticket_command($alert, $hostlist, $error_message) { ' --hostlist=' . cacti_escapeshellarg(implode(',', $hostlist)) . ' --message=' . cacti_escapeshellarg($alert['message']); - $output = array(); + $output = []; $return = 0; exec($command, $output, $return); @@ -1136,7 +1138,7 @@ function syslog_execute_alert_command($alert, $results, $hostname) { $cparts = preg_split('/\s+/', trim($command)); $executable = trim($cparts[0], '"\''); - $output = array(); + $output = []; $return = 0; if (cacti_sizeof($cparts) && is_executable($executable)) { @@ -1201,7 +1203,7 @@ function syslog_process_alerts($max_seq) { if (cacti_sizeof($alerts)) { foreach($alerts as $alert) { $sql = ''; - $params = array(); + $params = []; /* we roll up statistics depending on the level */ if ($alert['level'] == 1) { @@ -1247,7 +1249,7 @@ function syslog_process_alerts($max_seq) { } } - return array('syslog_alerts' => $syslog_alerts, 'syslog_alarms' => $syslog_alarms); + return ['syslog_alerts' => $syslog_alerts, 'syslog_alarms' => $syslog_alarms]; } /** @@ -1273,7 +1275,7 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') { $alert_count = 0; $syslog_alarms = 0; - $hostlist = array(); + $hostlist = []; $max_alerts = read_config_option('syslog_maxrecords'); $report_tag = false; $theme = false; @@ -1304,7 +1306,7 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') { $from_name = 'Cacti Reporting'; } - $from = array($from_email, $from_name); + $from = [$from_email, $from_name]; /** * format the destination Email addresses @@ -1314,7 +1316,7 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') { $additional = db_fetch_cell_prepared('SELECT emails FROM plugin_notification_lists WHERE id = ?', - array($alert['notify'])); + [$alert['notify']]); if ($additional != '') { $alert['email'] .= ', ' . trim($additional, ' ,'); @@ -1344,7 +1346,7 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') { /** * A list of all messages from the alert */ - $results = array(); + $results = []; syslog_debug(sprintf('Found %5s - Matching Records.', cacti_sizeof($at))); @@ -1498,14 +1500,14 @@ function syslog_process_alert($alert, $sql, $params, $count, $hostname = '') { WHERE alert_id = ? AND logtime > ? AND host = ?', - array($alert['id'], $date, $hostname)); + [$alert['id'], $date, $hostname]); } else { $found = syslog_db_fetch_cell_prepared('SELECT COUNT(*) FROM syslog_logs WHERE alert_id = ? AND logtime > ? AND host = "system"', - array($alert['id'], $date)); + [$alert['id'], $date]); } } @@ -1608,7 +1610,7 @@ function syslog_get_alert_sql(&$alert, $max_seq) { $syslog_incoming_config['programField'] = 'program'; } - $params = array(); + $params = []; $sql = ''; if ($alert['type'] == 'facility') { @@ -1675,7 +1677,7 @@ function syslog_get_alert_sql(&$alert, $max_seq) { $params[] = $max_seq; } - return array('sql' => $sql, 'params' => $params); + return ['sql' => $sql, 'params' => $params]; } /** @@ -1698,7 +1700,7 @@ function syslog_preprocess_incoming_records() { SET `status` = 1 WHERE `status` = 0 AND `seq` <= ?', - array($max_seq)); + [$max_seq]); syslog_debug('Max Sequence ID = ' . $max_seq); syslog_debug('-------------------------------------------------------------------------------------'); @@ -1707,7 +1709,7 @@ function syslog_preprocess_incoming_records() { FROM `' . $syslogdb_default . '`.`syslog_incoming` WHERE `status` = 1 AND `seq` <= ?', - array($max_seq)); + [$max_seq]); syslog_debug(sprintf('Found %5s - New Message(s) to process', $syslog_incoming)); @@ -1716,10 +1718,10 @@ function syslog_preprocess_incoming_records() { api_plugin_hook('plugin_syslog_before_processing'); - return array('max_seq' => $max_seq, 'incoming' => $syslog_incoming); + return ['max_seq' => $max_seq, 'incoming' => $syslog_incoming]; } - return array('max_seq' => 0, 'incoming' => 0); + return ['max_seq' => 0, 'incoming' => 0]; } /** @@ -1744,7 +1746,7 @@ function syslog_strip_incoming_domains($max_seq) { WHERE host LIKE ? AND `status` = 1 AND `seq` <= ?', - array('%' . $domain, $max_seq)); + ['%' . $domain, $max_seq]); } } } @@ -1772,7 +1774,7 @@ function syslog_check_cacti_hosts($host, $max_seq) { FROM host WHERE hostname = ? LIMIT 1', - array($host)); + [$host]); if (cacti_sizeof($cacti_host) && !empty($cacti_host['description'])) { syslog_db_execute_prepared('UPDATE `' . $syslogdb_default . '`.`syslog_incoming` @@ -1780,7 +1782,7 @@ function syslog_check_cacti_hosts($host, $max_seq) { WHERE host = ? AND `status` = 1 AND `seq` <= ?', - array($cacti_host['description'], $host, $max_seq)); + [$cacti_host['description'], $host, $max_seq]); return true; } @@ -1812,7 +1814,7 @@ function syslog_update_reference_tables($max_seq) { FROM `' . $syslogdb_default . '`.`syslog_incoming` WHERE `status` = 1 AND `seq` <= ?', - array($max_seq)); + [$max_seq]); foreach($hosts as $host) { if (!isset($host['host']) || empty($host['host'])) { @@ -1843,7 +1845,7 @@ function syslog_update_reference_tables($max_seq) { WHERE host = ? AND `status` = 1 AND `seq` <= ?", - array($unresolved_host, $host['host'], $max_seq)); + [$unresolved_host, $host['host'], $max_seq]); } } } @@ -1857,7 +1859,7 @@ function syslog_update_reference_tables($max_seq) { ON DUPLICATE KEY UPDATE program=VALUES(program), last_updated=VALUES(last_updated)', - array($max_seq)); + [$max_seq]); syslog_db_execute_prepared('INSERT INTO `' . $syslogdb_default . '`.`syslog_hosts` (host, last_updated) @@ -1868,7 +1870,7 @@ function syslog_update_reference_tables($max_seq) { ON DUPLICATE KEY UPDATE host=VALUES(host), last_updated=NOW()', - array($max_seq)); + [$max_seq]); syslog_db_execute_prepared('INSERT INTO `' . $syslogdb_default . '`.`syslog_host_facilities` (host_id, facility_id) @@ -1886,7 +1888,7 @@ function syslog_update_reference_tables($max_seq) { ON DUPLICATE KEY UPDATE host_id=VALUES(host_id), last_updated=NOW()', - array($max_seq)); + [$max_seq]); } /** @@ -1914,7 +1916,7 @@ function syslog_update_statistics($max_seq) { AND si.`seq` <= ? GROUP BY host_id, priority_id, facility_id, program_id) AS merge GROUP BY host_id, priority_id, facility_id, program_id', - array($max_seq)); + [$max_seq]); $stats = db_affected_rows($syslog_cnn); @@ -1949,7 +1951,7 @@ function syslog_incoming_to_syslog($max_seq) { WHERE si.`status` = 1 AND si.`seq` <= ? ) AS merge', - array($max_seq)); + [$max_seq]); $moved = db_affected_rows($syslog_cnn); @@ -1961,7 +1963,7 @@ function syslog_incoming_to_syslog($max_seq) { syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_incoming` WHERE `status` = 1 AND `seq` <= ?', - array($max_seq)); + [$max_seq]); syslog_debug(sprintf('Deleted %5s - Already Processed Message(s) from incoming', db_affected_rows($syslog_cnn))); @@ -1971,7 +1973,7 @@ function syslog_incoming_to_syslog($max_seq) { syslog_debug(sprintf('Deleted %5s - Stale Message(s) from incoming', $stale)); - return array('moved' => $moved, 'stale' => $stale); + return ['moved' => $moved, 'stale' => $stale]; } /** @@ -1994,7 +1996,7 @@ function syslog_postprocess_tables() { if (read_config_option('syslog_retention') > 0) { syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_statistics` WHERE insert_time < ?', - array($delete_date)); + [$delete_date]); syslog_debug(sprintf('Deleted %5s - Syslog Statistics Record(s)', db_affected_rows($syslog_cnn))); } @@ -2008,25 +2010,25 @@ function syslog_postprocess_tables() { syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_logs` WHERE logtime < ?', - array($delete_date)); + [$delete_date]); syslog_debug(sprintf('Deleted %5s - Syslog alarm log Record(s)', db_affected_rows($syslog_cnn))); syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_hosts` WHERE last_updated < ?', - array($delete_date)); + [$delete_date]); syslog_debug(sprintf('Deleted %5s - Syslog Host Record(s)', db_affected_rows($syslog_cnn))); syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_programs` WHERE last_updated < ?', - array($delete_date)); + [$delete_date]); syslog_debug(sprintf('Deleted %5s - Old programs from programs table', db_affected_rows($syslog_cnn))); syslog_db_execute_prepared('DELETE FROM `' . $syslogdb_default . '`.`syslog_host_facilities` WHERE last_updated < ?', - array($delete_date)); + [$delete_date]); syslog_debug(sprintf('Deleted %5s - Syslog Host/Facility Record(s)', db_affected_rows($syslog_cnn))); } @@ -2141,7 +2143,7 @@ function syslog_process_reports() { syslog_debug('We have ' . db_affected_rows($syslog_cnn) . ' items for the Report'); - $classes = array('even', 'odd'); + $classes = ['even', 'odd']; if (cacti_sizeof($items)) { $i = 0; @@ -2207,7 +2209,7 @@ function syslog_process_reports() { } } - return array('total_reports' => $total_reports, 'sent_reports' => $sent_reports); + return ['total_reports' => $total_reports, 'sent_reports' => $sent_reports]; } /** @@ -2370,7 +2372,7 @@ function syslog_init_variables() { * * @return (void) */ -function alert_setup_environment(&$alert, $results, $hostlist = array(), $hostname = '') { +function alert_setup_environment(&$alert, $results, $hostlist = [], $hostname = '') { global $severities, $syslog_levels, $syslog_facilities; putenv('ALERT_ALERTID=' . cacti_escapeshellarg($alert['id'])); diff --git a/images/index.php b/images/index.php index e6bad33..62afe8c 100644 --- a/images/index.php +++ b/images/index.php @@ -1,4 +1,6 @@ 'emerg', 1 => 'crit', 2 => 'alert', @@ -483,7 +485,7 @@ function syslog_setup_table_new($options) { 6 => 'info', 7 => 'debug', 8 => 'other' - ); + ]; // Set default if they are not set. if (!cacti_sizeof($options)) { @@ -814,8 +816,8 @@ function syslog_replicate_in() { function syslog_replace_data($table, &$data) { if (cacti_sizeof($data)) { - $sqlData = array(); - $sqlQuery = array(); + $sqlData = []; + $sqlQuery = []; $columns = array_keys($data[0]); $create_sql = ''; @@ -932,18 +934,18 @@ function syslog_install_advisor($syslog_exists) { 'value' => '30', 'array' => $syslog_retentions ), - 'mode' => array( + 'mode' => [ 'method' => 'hidden', 'value' => 'install' - ), - 'install' => array( + ], + 'install' => [ 'method' => 'hidden', 'value' => 'true' - ), - 'id' => array( + ], + 'id' => [ 'method' => 'hidden', 'value' => 'syslog' - ) + ] ); $fields_syslog_update['dayparts'] = array( @@ -994,8 +996,8 @@ function syslog_install_advisor($syslog_exists) { html_start_box(__('Syslog %s Settings', $type, 'syslog'), '100%', '', '3', 'center', ''); draw_edit_form(array( - 'config' => array(), - 'fields' => inject_form_variables($fields_syslog_update, array())) + 'config' => [], + 'fields' => inject_form_variables($fields_syslog_update, [])) ); html_end_box(); @@ -1023,18 +1025,18 @@ function syslog_uninstall_advisor() { 'value' => 'all', 'array' => array('all' => __('Remove Everything (Logs, Tables, Settings)', 'syslog'), 'syslog' => __('Syslog Data Only', 'syslog')), ), - 'mode' => array( + 'mode' => [ 'method' => 'hidden', 'value' => 'uninstall' - ), - 'uninstall' => array( + ], + 'uninstall' => [ 'method' => 'hidden', 'value' => 'true' - ), - 'id' => array( + ], + 'id' => [ 'method' => 'hidden', 'value' => 'syslog' - ) + ] ); form_start('plugins.php'); @@ -1044,8 +1046,8 @@ function syslog_uninstall_advisor() { html_start_box(__('Syslog Uninstall Preferences', 'syslog'), '100%', '', '3', 'center', ''); draw_edit_form(array( - 'config' => array(), - 'fields' => inject_form_variables($fields_syslog_update, array())) + 'config' => [], + 'fields' => inject_form_variables($fields_syslog_update, [])) ); html_end_box(); @@ -1115,7 +1117,7 @@ function syslog_config_settings() { if (get_nfilter_request_var('tab') == 'syslog') { $formats = reports_get_format_files(); } elseif (empty($formats)) { - $formats = array(); + $formats = []; } $tabs['syslog'] = __('Syslog', 'syslog'); @@ -1316,7 +1318,7 @@ function syslog_config_arrays () { 4 => __('Export', 'syslog') ); - $syslog_levels = array( + $syslog_levels = [ 0 => 'emerg', 1 => 'crit', 2 => 'alert', @@ -1326,9 +1328,9 @@ function syslog_config_arrays () { 6 => 'info', 7 => 'debug', 8 => 'other' - ); + ]; - $syslog_facilities = array( + $syslog_facilities = [ 0 => 'kernel', 1 => 'user', 2 => 'mail', @@ -1353,7 +1355,7 @@ function syslog_config_arrays () { 21 => 'local5', 22 => 'local6', 23 => 'local7' - ); + ]; $syslog_retentions = array( '0' => __('Indefinite', 'syslog'), @@ -1455,16 +1457,16 @@ function syslog_config_arrays () { } if (function_exists('auth_augment_roles')) { - auth_augment_roles(__('Normal User'), array('syslog.php')); - auth_augment_roles(__('System Administration'), array('syslog_alerts.php', 'syslog_removal.php', 'syslog_reports.php')); + auth_augment_roles(__('Normal User'), ['syslog.php']); + auth_augment_roles(__('System Administration'), ['syslog_alerts.php', 'syslog_removal.php', 'syslog_reports.php']); } if (isset($_SESSION['syslog_info']) && $_SESSION['syslog_info'] != '') { - $messages['syslog_info'] = array('message' => $_SESSION['syslog_info'], 'type' => 'info'); + $messages['syslog_info'] = ['message' => $_SESSION['syslog_info'], 'type' => 'info']; } if (isset($_SESSION['syslog_error']) && $_SESSION['syslog_error'] != '') { - $messages['syslog_error'] = array('message' => $_SESSION['syslog_error'], 'type' => 'error'); + $messages['syslog_error'] = ['message' => $_SESSION['syslog_error'], 'type' => 'error']; } } @@ -1500,7 +1502,7 @@ function syslog_config_insert() { syslog_check_upgrade(); } -function syslog_graph_buttons($graph_elements = array()) { +function syslog_graph_buttons($graph_elements = []) { global $config, $timespan, $graph_timeshifts; if (!syslog_config_safe()) { @@ -1529,14 +1531,14 @@ function syslog_graph_buttons($graph_elements = array()) { $host_id = db_fetch_cell_prepared('SELECT host_id FROM graph_local WHERE id = ?', - array($graph_elements[1]['local_graph_id'])); + [$graph_elements[1]['local_graph_id']]); $sql_where = ''; if (!empty($host_id)) { $host = db_fetch_row_prepared('SELECT id, description, hostname FROM host WHERE id = ?', - array($host_id)); + [$host_id]); if (cacti_sizeof($host)) { if (!is_ipaddress($host['description'])) { diff --git a/syslog.php b/syslog.php index 7db1ef7..abae9f0 100644 --- a/syslog.php +++ b/syslog.php @@ -1,4 +1,6 @@ $host['host'], 'host_id' => $host['id'], 'class' => $class - ); + ]; } return json_encode($rhosts); } else { - return json_encode(array()); + return json_encode([]); } } @@ -222,59 +224,59 @@ function syslog_statistics() { /* ================= input validation and session storage ================= */ $filters = array( - 'rows' => array( + 'rows' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1', - ), + ], 'refresh' => array( 'filter' => FILTER_VALIDATE_INT, 'default' => read_config_option('syslog_refresh'), ), - 'timespan' => array( + 'timespan' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '300', - ), - 'page' => array( + ], + 'page' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'rfilter' => array( + ], + 'rfilter' => [ 'filter' => FILTER_VALIDATE_IS_REGEX, 'pageset' => true, 'default' => '' - ), - 'host' => array( + ], + 'host' => [ 'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST, 'pageset' => true, 'default' => '', - ), - 'facility' => array( + ], + 'facility' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '', - ), - 'priority' => array( + ], + 'priority' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '', - ), + ], 'program' => array( 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_column' => array( 'filter' => FILTER_CALLBACK, 'default' => 'host', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_direction' => array( 'filter' => FILTER_CALLBACK, 'default' => 'ASC', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ) ); @@ -667,14 +669,14 @@ function syslog_request_validation($current_tab, $force = false) { 'pageset' => true, 'default' => read_user_setting('syslog_rows', '-1', $force) ), - 'page' => array( + 'page' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'id' => array( + ], + 'id' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '' - ), + ], 'removal' => array( 'filter' => FILTER_VALIDATE_INT, 'default' => read_user_setting('syslog_removal', '1', $force) @@ -697,27 +699,27 @@ function syslog_request_validation($current_tab, $force = false) { 'filter' => FILTER_VALIDATE_INT, 'default' => read_user_setting('syslog_trimval', '75', $force) ), - 'enabled' => array( + 'enabled' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1' - ), - 'host' => array( + ], + 'host' => [ 'filter' => FILTER_VALIDATE_IS_NUMERIC_LIST, 'pageset' => true, 'default' => '', - ), + ], 'efacility' => array( 'filter' => FILTER_CALLBACK, 'pageset' => true, 'default' => read_user_setting('syslog_efacility', '-1', $force), - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'epriority' => array( 'filter' => FILTER_CALLBACK, 'pageset' => true, 'default' => read_user_setting('syslog_epriority', '-1', $force), - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'eprogram' => array( 'filter' => FILTER_VALIDATE_INT, @@ -729,33 +731,33 @@ function syslog_request_validation($current_tab, $force = false) { 'pageset' => true, 'default' => read_user_setting('syslog_grouping', '0', $force), ), - 'rfilter' => array( + 'rfilter' => [ 'filter' => FILTER_VALIDATE_IS_REGEX, 'pageset' => true, 'default' => '' - ), + ], 'date1' => array( 'filter' => FILTER_CALLBACK, 'pageset' => true, 'default' => '', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'date2' => array( 'filter' => FILTER_CALLBACK, 'pageset' => true, 'default' => '', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_column' => array( 'filter' => FILTER_CALLBACK, 'default' => 'logtime', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_direction' => array( 'filter' => FILTER_CALLBACK, 'default' => 'DESC', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ) ); @@ -780,7 +782,7 @@ function set_shift_span($shift_span, $session_prefix) { global $graph_timeshifts; if ($shift_span == 'span' || ($shift_span === false && (!isset($_SESSION[$session_prefix . '_date1']) || !isset($_SESSION[$session_prefix . '_date2'])))) { - $span = array(); + $span = []; // Calculate the timespan $first_weekdayid = read_user_setting('first_weekdayid'); @@ -804,14 +806,14 @@ function set_shift_span($shift_span, $session_prefix) { } else { // Session keys missing; fall back to a fresh span calculation. $first_weekdayid = read_user_setting('first_weekdayid'); - $span = array(); + $span = []; get_timespan($span, time(), get_request_var('predefined_timespan'), $first_weekdayid); set_request_var('date1', date('Y-m-d H:i:s', $span['begin_now'])); set_request_var('date2', date('Y-m-d H:i:s', $span['end_now'])); set_request_var('custom', false); } } elseif ($shift_span == 'shift') { - $span = array(); + $span = []; $span['current_value_date1'] = get_request_var('date1'); $span['current_value_date2'] = get_request_var('date2'); @@ -988,10 +990,10 @@ function get_syslog_messages(&$sql_where, $rows, $tab) { if ($tab == 'syslog') { // Check if grouping is enabled $grouping_enabled = isset_request_var('grouping') && get_request_var('grouping') == '1'; - + if ($grouping_enabled) { if (get_request_var('removal') == '-1') { - $query_sql = "SELECT + $query_sql = "SELECT syslog.host_id, syslog.message, syslog.program_id, @@ -1013,7 +1015,7 @@ function get_syslog_messages(&$sql_where, $rows, $tab) { $sql_limit"; } elseif (get_request_var('removal') == '1') { $query_sql = "SELECT * FROM ( - (SELECT + (SELECT syslog.host_id, syslog.message, syslog.program_id, @@ -1031,7 +1033,7 @@ function get_syslog_messages(&$sql_where, $rows, $tab) { ON syslog.program_id=syslog_programs.program_id " . $sql_where . " GROUP BY syslog.host_id, syslog.message, syslog.program_id, syslog.facility_id, syslog.priority_id - ) UNION (SELECT + ) UNION (SELECT syslog.host_id, syslog.message, syslog.program_id, @@ -1054,7 +1056,7 @@ function get_syslog_messages(&$sql_where, $rows, $tab) { $sql_order $sql_limit"; } else { - $query_sql = "SELECT + $query_sql = "SELECT syslog.host_id, syslog.message, syslog.program_id, @@ -1366,7 +1368,9 @@ function syslog_filter($sql_where, $tab) { print ' selected'; } } + print '>'; + print $host['host'] . ''; } } @@ -1597,7 +1601,7 @@ function syslog_messages($tab = 'syslog') { if ($tab == 'syslog') { // Check if grouping is enabled for row count $grouping_enabled = isset_request_var('grouping') && get_request_var('grouping') == '1'; - + if ($grouping_enabled) { // When grouping, count distinct groups instead of individual rows if (get_request_var('removal') == 1) { @@ -1660,7 +1664,7 @@ function syslog_messages($tab = 'syslog') { if ($tab == 'syslog') { // Check if grouping is enabled for display $grouping_enabled = isset_request_var('grouping') && get_request_var('grouping') == '1'; - + if (api_plugin_user_realm_auth('syslog_alerts.php')) { $display_text = array( 'nosortt' => array(__('Actions', 'syslog'), 'ASC'), @@ -1670,7 +1674,7 @@ function syslog_messages($tab = 'syslog') { 'message' => array(__('Message', 'syslog'), 'ASC'), 'facility_id' => array(__('Facility', 'syslog'), 'ASC'), 'priority_id' => array(__('Priority', 'syslog'), 'ASC')); - + // Add count column if grouping is enabled if ($grouping_enabled) { $display_text['occurrence_count'] = array(__('Count', 'syslog'), 'DESC'); @@ -1683,7 +1687,7 @@ function syslog_messages($tab = 'syslog') { 'message' => array(__('Message', 'syslog'), 'ASC'), 'facility_id' => array(__('Facility', 'syslog'), 'ASC'), 'priority_id' => array(__('Priority', 'syslog'), 'ASC')); - + // Add count column if grouping is enabled if ($grouping_enabled) { $display_text['occurrence_count'] = array(__('Count', 'syslog'), 'DESC'); @@ -1745,24 +1749,24 @@ function syslog_messages($tab = 'syslog') { } else { form_selectable_cell($sm['logtime'], $sm['seq'], '', 'left'); } - - form_selectable_cell(isset($hosts[$sm['host_id']]) ? $hosts[$sm['host_id']]:__('Unknown', 'syslog'), $sm['seq'], '', 'left'); + + form_selectable_cell($hosts[$sm['host_id']] ?? __('Unknown', 'syslog'), $sm['seq'], '', 'left'); form_selectable_cell($sm['program'], $sm['seq'], '', 'left'); form_selectable_cell(filter_value(title_trim($sm[$syslog_incoming_config['textField']], get_request_var_request('trimval')), get_request_var('rfilter')), $sm['seq'], '', 'left syslogMessage'); - form_selectable_cell(isset($facilities[$sm['facility_id']]) ? $facilities[$sm['facility_id']]:__('Unknown', 'syslog'), $sm['seq'], '', 'left'); - form_selectable_cell(isset($priorities[$sm['priority_id']]) ? $priorities[$sm['priority_id']]:__('Unknown', 'syslog'), $sm['seq'], '', 'left'); + form_selectable_cell($facilities[$sm['facility_id']] ?? __('Unknown', 'syslog'), $sm['seq'], '', 'left'); + form_selectable_cell($priorities[$sm['priority_id']] ?? __('Unknown', 'syslog'), $sm['seq'], '', 'left'); // Add occurrence count if grouping is enabled if ($grouping_enabled) { - form_selectable_cell(isset($sm['occurrence_count']) ? $sm['occurrence_count'] : 1, $sm['seq'], '', 'right'); + form_selectable_cell($sm['occurrence_count'] ?? 1, $sm['seq'], '', 'right'); } form_end_row(); - + // If grouping is enabled and there are multiple occurrences, add hidden detail rows if ($grouping_enabled && isset($sm['occurrence_count']) && $sm['occurrence_count'] > 1 && isset($sm['seq_list'])) { $seq_array = explode(',', $sm['seq_list']); - + // Get individual messages for this group $detail_messages = syslog_db_fetch_assoc("SELECT syslog.*, syslog_programs.program FROM `" . $syslogdb_default . "`.`" . (($sm['mtype'] == 'main') ? 'syslog' : 'syslog_removed') . "` AS syslog @@ -1770,10 +1774,10 @@ function syslog_messages($tab = 'syslog') { ON syslog.program_id=syslog_programs.program_id WHERE syslog.seq IN (" . implode(',', array_map('intval', $seq_array)) . ") ORDER BY syslog.logtime DESC"); - + if (cacti_sizeof($detail_messages)) { foreach ($detail_messages as $dm) { - $severity_class = syslog_row_color($dm['priority_id'], $dm['message']); + $severity_class = syslog_row_color($dm['priority_id'], $dm['message']); print ""; if (api_plugin_user_realm_auth('syslog_alerts.php')) { $url = ''; @@ -1783,18 +1787,18 @@ function syslog_messages($tab = 'syslog') { } print "" . $url . ""; } - + print "" . html_escape($dm['logtime']) . ""; - print "" . html_escape(isset($hosts[$dm['host_id']]) ? $hosts[$dm['host_id']] : __('Unknown', 'syslog')) . ""; + print "" . html_escape($hosts[$dm['host_id']] ?? __('Unknown', 'syslog')) . ""; print "" . html_escape($dm['program']) . ""; print "" . filter_value(title_trim($dm[$syslog_incoming_config['textField']], get_request_var_request('trimval')), get_request_var('rfilter')) . ""; - print "" . html_escape(isset($facilities[$dm['facility_id']]) ? $facilities[$dm['facility_id']] : __('Unknown', 'syslog')) . ""; - print "" . html_escape(isset($priorities[$dm['priority_id']]) ? $priorities[$dm['priority_id']] : __('Unknown', 'syslog')) . ""; - + print "" . html_escape($facilities[$dm['facility_id']] ?? __('Unknown', 'syslog')) . ""; + print "" . html_escape($priorities[$dm['priority_id']] ?? __('Unknown', 'syslog')) . ""; + if ($grouping_enabled) { print ""; } - + print ""; } } @@ -1845,7 +1849,7 @@ function syslog_messages($tab = 'syslog') { form_selectable_cell(filter_value($log['name'] != '' ? $log['name']:__('Alert Removed', 'syslog'), get_request_var('rfilter'), $config['url_path'] . 'plugins/syslog/syslog.php?id=' . $log['seq'] . '&tab=current'), $log['seq'], '', 'left'); - form_selectable_cell(isset($severities[$log['severity']]) ? $severities[$log['severity']]:__('Unknown', 'syslog'), $log['seq'], '', 'left'); + form_selectable_cell($severities[$log['severity']] ?? __('Unknown', 'syslog'), $log['seq'], '', 'left'); form_selectable_cell($log['logtime'], $log['seq'], '', 'left'); form_selectable_cell(filter_value(title_trim($log['logmsg'], get_request_var_request('trimval')), get_request_var('rfilter')), $log['seq'], '', 'syslogMessage left'); @@ -1875,7 +1879,7 @@ function save_settings() { // syslog_request_validation($current_tab); - $variables = array( + $variables = [ 'rows', 'refresh', 'removal', @@ -1886,7 +1890,7 @@ function save_settings() { 'grouping', 'predefined_timespan', 'predefined_timeshift', - ); + ]; foreach($variables as $v) { if (isset_request_var($v)) { @@ -1947,9 +1951,9 @@ function html_program_filter($program_id = '-1', $none_entry = '', $action = 'aj } function get_ajax_programs($include_any = true, $include_none = false, $sql_where = '') { - $return = array(); + $return = []; - $term = get_filter_request_var('term', FILTER_CALLBACK, array('options' => 'sanitize_search_string')); + $term = get_filter_request_var('term', FILTER_CALLBACK, ['options' => 'sanitize_search_string']); if ($term != '') { $sql_where .= ($sql_where != '' ? ' AND ' : 'WHERE ') . "program LIKE '%$term%'"; } @@ -1980,11 +1984,11 @@ function get_ajax_programs($include_any = true, $include_none = false, $sql_wher if (cacti_sizeof($programs)) { foreach($programs as $program) { - $return[] = array( + $return[] = [ 'label' => $program['program'], 'value' => $program['program'], 'id' => $program['program_id'] - ); + ]; } } diff --git a/syslog_alerts.php b/syslog_alerts.php index 1c9d9ac..a6c7bf5 100644 --- a/syslog_alerts.php +++ b/syslog_alerts.php @@ -1,4 +1,6 @@ 'api_syslog_alert_remove', '2' => 'api_syslog_alert_disable', '3' => 'api_syslog_alert_enable' - ), + ], '4', get_nfilter_request_var('selected_items') ); @@ -142,7 +144,7 @@ function form_actions() { html_start_box($syslog_actions[get_request_var('drp_action')], '60%', '', '3', 'center', ''); /* setup some variables */ - $alert_array = array(); $alert_list = ''; + $alert_array = []; $alert_list = ''; /* loop through each of the clusters selected on the previous page and get more info about them */ foreach ($_POST as $var => $val) { @@ -237,7 +239,7 @@ function alert_export() { $data = syslog_db_fetch_row_prepared('SELECT * FROM `' . $syslogdb_default . '`.`syslog_alert` WHERE id = ?', - array($id)); + [$id]); if (cacti_sizeof($data)) { unset($data['id']); @@ -371,7 +373,7 @@ function syslog_get_alert_records(&$sql_where, $rows) { return syslog_db_fetch_assoc($query_string); } -function get_repeat_array() { +function get_repeat_[] { $poller_interval = read_config_option('poller_interval'); $multiplier = 300 / $poller_interval; @@ -471,7 +473,7 @@ function syslog_action_edit() { $lists = array('0' => __('N/A', 'syslog')); } - $repeatarray = get_repeat_array(); + $repeatarray = get_repeat_[]; $fields_syslog_alert_edit = array( 'spacer0' => array( @@ -619,18 +621,18 @@ function syslog_action_edit() { 'value' => '|arg1:command|', 'default' => '', ), - 'id' => array( + 'id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - '_id' => array( + ], + '_id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - 'save_component_alert' => array( + ], + 'save_component_alert' => [ 'method' => 'hidden', 'value' => '1' - ) + ] ); form_start('syslog_alerts.php', 'syslog_edit'); @@ -639,8 +641,8 @@ function syslog_action_edit() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), - 'fields' => inject_form_variables($fields_syslog_alert_edit, (cacti_sizeof($alert) ? $alert : array())) + 'config' => ['no_form_tag' => true], + 'fields' => inject_form_variables($fields_syslog_alert_edit, (cacti_sizeof($alert) ? $alert : [])) ) ); @@ -760,38 +762,38 @@ function syslog_alerts() { /* ================= input validation and session storage ================= */ $filters = array( - 'rows' => array( + 'rows' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1', - ), - 'page' => array( + ], + 'page' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'id' => array( + ], + 'id' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'enabled' => array( + ], + 'enabled' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1' - ), - 'filter' => array( + ], + 'filter' => [ 'filter' => FILTER_DEFAULT, 'pageset' => true, 'default' => '' - ), + ], 'sort_column' => array( 'filter' => FILTER_CALLBACK, 'default' => 'name', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_direction' => array( 'filter' => FILTER_CALLBACK, 'default' => 'ASC', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ) ); @@ -921,7 +923,7 @@ function import() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), + 'config' => ['no_form_tag' => true], 'fields' => $form_data ) ); @@ -936,14 +938,14 @@ function import() { function alert_import() { $xml_data = syslog_get_import_xml_payload('syslog_alerts.php?header=false'); - $xml_array = xml2array($xml_data); + $xml_array = xml2[$xml_data]; - $debug_data = array(); + $debug_data = []; if (cacti_sizeof($xml_array)) { foreach ($xml_array as $template => $contents) { $error = false; - $save = array(); + $save = []; if (cacti_sizeof($contents)) { foreach ($contents as $name => $value) { @@ -953,7 +955,7 @@ function alert_import() { $found = db_fetch_cell_prepared('SELECT id FROM syslog_alert WHERE hash = ?', - array($value)); + [$value]); if (!empty($found)) { $save['hash'] = $value; diff --git a/syslog_batch_transfer.php b/syslog_batch_transfer.php index b94ade9..3788a4f 100644 --- a/syslog_batch_transfer.php +++ b/syslog_batch_transfer.php @@ -1,4 +1,6 @@ 'api_syslog_removal_remove', '2' => 'api_syslog_removal_disable', '3' => 'api_syslog_removal_enable', '4' => 'api_syslog_removal_reprocess' - ), + ], '5', get_nfilter_request_var('selected_items') ); @@ -148,7 +150,7 @@ function form_actions() { html_start_box($syslog_actions[get_request_var('drp_action')], '60%', '', '3', 'center', ''); /* setup some variables */ - $removal_array = array(); $removal_list = ''; + $removal_array = []; $removal_list = ''; /* loop through each of the clusters selected on the previous page and get more info about them */ foreach ($_POST as $var => $val) { @@ -256,7 +258,7 @@ function removal_export() { $data = syslog_db_fetch_row_prepared('SELECT * FROM `' . $syslogdb_default . '`.`syslog_remove` WHERE id = ?', - array($id)); + [$id]); if (cacti_sizeof($data)) { unset($data['id']); @@ -328,7 +330,7 @@ function api_syslog_removal_reprocess($id) { $name = syslog_db_fetch_cell_prepared('SELECT name FROM syslog_remove WHERE id = ?', - array($id)); + [$id]); raise_message('syslog_info' . $id, __('Rule \'%s\' resulted in %s/%s messages removed/transferred', $name, $syslog_removed, $syslog_xferred, 'syslog'), MESSAGE_LEVEL_INFO); } @@ -462,18 +464,18 @@ function syslog_action_edit() { 'value' => '|arg1:notes|', 'default' => '', ), - 'id' => array( + 'id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - '_id' => array( + ], + '_id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - 'save_component_removal' => array( + ], + 'save_component_removal' => [ 'method' => 'hidden', 'value' => '1' - ) + ] ); form_start('syslog_removal.php', 'syslog_edit'); @@ -482,8 +484,8 @@ function syslog_action_edit() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), - 'fields' => inject_form_variables($fields_syslog_removal_edit, (isset($removal) ? $removal : array())) + 'config' => ['no_form_tag' => true], + 'fields' => inject_form_variables($fields_syslog_removal_edit, ($removal ?? [])) ) ); @@ -563,38 +565,38 @@ function syslog_removal() { /* ================= input validation and session storage ================= */ $filters = array( - 'rows' => array( + 'rows' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1', - ), - 'page' => array( + ], + 'page' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'id' => array( + ], + 'id' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'enabled' => array( + ], + 'enabled' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1' - ), - 'filter' => array( + ], + 'filter' => [ 'filter' => FILTER_DEFAULT, 'pageset' => true, 'default' => '' - ), + ], 'sort_column' => array( 'filter' => FILTER_CALLBACK, 'default' => 'name', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_direction' => array( 'filter' => FILTER_CALLBACK, 'default' => 'ASC', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ) ); @@ -718,7 +720,7 @@ function import() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), + 'config' => ['no_form_tag' => true], 'fields' => $form_data ) ); @@ -734,14 +736,14 @@ function removal_import() { $xml_data = syslog_get_import_xml_payload('syslog_removal.php?header=false'); /* obtain debug information if it's set */ - $xml_array = xml2array($xml_data); + $xml_array = xml2[$xml_data]; - $debug_data = array(); + $debug_data = []; if (cacti_sizeof($xml_array)) { foreach ($xml_array as $template => $contents) { $error = false; - $save = array(); + $save = []; if (cacti_sizeof($contents)) { foreach ($contents as $name => $value) { @@ -751,7 +753,7 @@ function removal_import() { $found = syslog_db_fetch_cell_prepared('SELECT id FROM syslog_remove WHERE hash = ?', - array($value)); + [$value]); if (!empty($found)) { $save['hash'] = $value; diff --git a/syslog_reports.php b/syslog_reports.php index 1a97b3a..141cbd7 100644 --- a/syslog_reports.php +++ b/syslog_reports.php @@ -1,4 +1,6 @@ 'api_syslog_report_remove', '2' => 'api_syslog_report_disable', '3' => 'api_syslog_report_enable' - ), + ], '4', get_nfilter_request_var('selected_items') ); @@ -139,7 +141,7 @@ function form_actions() { html_start_box($syslog_actions[get_request_var('drp_action')], '60%', '', '3', 'center', ''); /* setup some variables */ - $report_array = array(); $report_list = ''; + $report_array = []; $report_list = ''; /* loop through each of the clusters selected on the previous page and get more info about them */ foreach ($_POST as $var => $val) { @@ -234,7 +236,7 @@ function report_export() { $data = db_fetch_row_prepared('SELECT * FROM syslog_reports WHERE id = ?', - array($id)); + [$id]); if (cacti_sizeof($data)) { unset($data['id']); @@ -506,18 +508,18 @@ function syslog_action_edit() { 'value' => '|arg1:notes|', 'default' => '', ), - 'id' => array( + 'id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - '_id' => array( + ], + '_id' => [ 'method' => 'hidden_zero', 'value' => '|arg1:id|' - ), - 'save_component_report' => array( + ], + 'save_component_report' => [ 'method' => 'hidden', 'value' => '1' - ) + ] ); form_start('syslog_reports.php', 'syslog_edit'); @@ -526,8 +528,8 @@ function syslog_action_edit() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), - 'fields' => inject_form_variables($fields_syslog_report_edit, (isset($report) ? $report : array())) + 'config' => ['no_form_tag' => true], + 'fields' => inject_form_variables($fields_syslog_report_edit, ($report ?? [])) ) ); @@ -624,38 +626,38 @@ function syslog_report() { /* ================= input validation and session storage ================= */ $filters = array( - 'rows' => array( + 'rows' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1', - ), - 'page' => array( + ], + 'page' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'id' => array( + ], + 'id' => [ 'filter' => FILTER_VALIDATE_INT, 'default' => '1' - ), - 'enabled' => array( + ], + 'enabled' => [ 'filter' => FILTER_VALIDATE_INT, 'pageset' => true, 'default' => '-1' - ), - 'filter' => array( + ], + 'filter' => [ 'filter' => FILTER_DEFAULT, 'pageset' => true, 'default' => '' - ), + ], 'sort_column' => array( 'filter' => FILTER_CALLBACK, 'default' => 'name', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ), 'sort_direction' => array( 'filter' => FILTER_CALLBACK, 'default' => 'ASC', - 'options' => array('options' => 'sanitize_search_string') + 'options' => ['options' => 'sanitize_search_string'] ) ); @@ -783,7 +785,7 @@ function import() { draw_edit_form( array( - 'config' => array('no_form_tag' => true), + 'config' => ['no_form_tag' => true], 'fields' => $form_data ) ); @@ -799,14 +801,14 @@ function report_import() { $xml_data = syslog_get_import_xml_payload('syslog_reports.php?header=false'); /* obtain debug information if it's set */ - $xml_array = xml2array($xml_data); + $xml_array = xml2[$xml_data]; - $debug_data = array(); + $debug_data = []; if (cacti_sizeof($xml_array)) { foreach ($xml_array as $template => $contents) { $error = false; - $save = array(); + $save = []; if (cacti_sizeof($contents)) { foreach ($contents as $name => $value) { @@ -816,7 +818,7 @@ function report_import() { $found = db_fetch_cell_prepared('SELECT id FROM syslog_reports WHERE hash = ?', - array($value)); + [$value]); if (!empty($found)) { $save['hash'] = $value; diff --git a/template/index.php b/template/index.php index e6bad33..62afe8c 100644 --- a/template/index.php +++ b/template/index.php @@ -1,4 +1,6 @@ getExtension() === 'php' && strpos($file->getPathname(), '/vendor/') === false) { + $content = file_get_contents($file->getPathname()); + } + } +}); + +test('functions.php can be loaded with strict_types', function () { + // This will throw a TypeError if there's an immediate conflict upon loading + // (though unlikely just for loading unless there are default value issues) + require_once dirname(__DIR__, 2) . '/functions.php'; + expect(function_exists('syslog_version'))->toBeTrue(); +}); diff --git a/tests/regression/issue253_alert_sql_placeholder_test.php b/tests/regression/issue253_alert_sql_placeholder_test.php index 57f3901..6c0b2b3 100644 --- a/tests/regression/issue253_alert_sql_placeholder_test.php +++ b/tests/regression/issue253_alert_sql_placeholder_test.php @@ -1,12 +1,14 @@ 'host', 'programField' => 'program', 'facilityField'=> 'facility', 'textField' => 'message' -); +]; require_once dirname(__DIR__, 2) . '/functions.php'; @@ -17,15 +19,15 @@ function issue253_assert($condition, $message) { } } -$hostAlert = array( +$hostAlert = [ 'type' => 'host', 'message' => 'router1' -); +]; -$programAlert = array( +$programAlert = [ 'type' => 'program', 'message' => 'sshd' -); +]; $hostSql = syslog_get_alert_sql($hostAlert, 55); $progSql = syslog_get_alert_sql($programAlert, 66); diff --git a/tests/regression/issue254_partition_table_locking_test.php b/tests/regression/issue254_partition_table_locking_test.php index 2f02021..1638388 100644 --- a/tests/regression/issue254_partition_table_locking_test.php +++ b/tests/regression/issue254_partition_table_locking_test.php @@ -1,5 +1,7 @@ 'CREATE TABLE `syslog_alert` (`id` INT NOT NULL)'); if (!function_exists('db_fetch_row')) { @@ -51,10 +53,10 @@ function syslog_db_execute($sql) { if (!function_exists('syslog_db_execute_prepared')) { function syslog_db_execute_prepared($sql, $params) { - $GLOBALS['syslog_replace_data_prepared_calls'][] = array( + $GLOBALS['syslog_replace_data_prepared_calls'][] = [ 'sql' => $sql, 'params' => $params - ); + ]; return true; } @@ -69,11 +71,11 @@ function cacti_log($message, $output = false, $facility = 'SYSTEM', $level = '') require_once dirname(__DIR__, 2) . '/setup.php'; $data = array( - array( + [ 'id' => 1, 'hash' => 'abc123', 'name' => 'sample' - ) + ] ); syslog_replace_data('syslog_alert', $data); @@ -102,8 +104,8 @@ function cacti_log($message, $output = false, $facility = 'SYSTEM', $level = '') exit(1); } -$GLOBALS['syslog_replace_data_execute_calls'] = array(); -$GLOBALS['syslog_replace_data_prepared_calls'] = array(); +$GLOBALS['syslog_replace_data_execute_calls'] = []; +$GLOBALS['syslog_replace_data_prepared_calls'] = []; $GLOBALS['issue258_show_create'] = false; syslog_replace_data('syslog_alert', $data); diff --git a/tests/regression/issue269_import_text_branch_logic_test.php b/tests/regression/issue269_import_text_branch_logic_test.php index c03c988..e6980df 100644 --- a/tests/regression/issue269_import_text_branch_logic_test.php +++ b/tests/regression/issue269_import_text_branch_logic_test.php @@ -1,5 +1,7 @@ $root . '/syslog_alerts.php', 'removal_import' => $root . '/syslog_removal.php', 'report_import' => $root . '/syslog_reports.php', -); +]; foreach ($targets as $func => $target) { $content = file_get_contents($target); diff --git a/tests/regression/issue269_import_text_trim_check_test.php b/tests/regression/issue269_import_text_trim_check_test.php index 023a930..e6b7cb1 100644 --- a/tests/regression/issue269_import_text_trim_check_test.php +++ b/tests/regression/issue269_import_text_trim_check_test.php @@ -1,11 +1,13 @@