From 9f22b18dc81ec5ecc85054d5185cea4dd739e493 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Thu, 25 Feb 2016 14:30:40 -0600 Subject: [PATCH] Split is removed in PHP7, replace with explode as none were using it as a regex. Also fix two array keys without quotes in include/syslog.php Fixes #2205 --- check-services.php | 2 +- html/includes/graphs/application/shoutcast_multi_bits.inc.php | 2 +- .../includes/graphs/application/shoutcast_multi_stats.inc.php | 2 +- html/pages/device/apps/shoutcast.inc.php | 2 +- html/pages/settings/alerting.inc.php | 2 +- includes/polling/applications/shoutcast.inc.php | 2 +- includes/polling/os/netapp.inc.php | 2 +- includes/polling/temperatures/netapp.inc.php | 2 +- includes/services/dns/check.inc | 2 +- includes/services/domain_expire/check.inc | 2 +- includes/services/ftp/check.inc | 2 +- includes/services/http/check.inc | 2 +- includes/services/icmp/check.inc | 2 +- includes/services/imap/check.inc | 2 +- includes/services/ircd/check.inc | 2 +- includes/services/mysql/check.inc | 2 +- includes/services/ntp/check.inc | 2 +- includes/services/pop/check.inc | 2 +- includes/services/simap/check.inc | 2 +- includes/services/smtp/check.inc | 2 +- includes/services/spop/check.inc | 2 +- includes/services/ssh/check.inc | 2 +- includes/services/telnet/check.inc | 2 +- includes/syslog.php | 4 ++-- scripts/shoutcast.php | 2 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/check-services.php b/check-services.php index 55295a70f7..e053126b22 100755 --- a/check-services.php +++ b/check-services.php @@ -34,7 +34,7 @@ foreach (dbFetchRows('SELECT * FROM `devices` AS D, `services` AS S WHERE S.devi $cmd = $config['nagios_plugins'] . "/check_" . $service['service_type'] . " -H " . ($service['service_ip'] ? $service['service_ip'] : $service['hostname']); $cmd .= " ".$service['service_param']; $check = shell_exec($cmd); - list($check, $time) = split("\|", $check); + list($check, $time) = explode("|", $check); if(stristr($check, "ok -")) { $status = 1; } diff --git a/html/includes/graphs/application/shoutcast_multi_bits.inc.php b/html/includes/graphs/application/shoutcast_multi_bits.inc.php index d526863aea..a54d6b8d5a 100644 --- a/html/includes/graphs/application/shoutcast_multi_bits.inc.php +++ b/html/includes/graphs/application/shoutcast_multi_bits.inc.php @@ -37,7 +37,7 @@ if ($handle = opendir($rrddir)) { foreach ($files as $id => $file) { $hostname = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file); $hostname = eregi_replace('.rrd', '', $hostname); - list($host, $port) = split('_', $hostname, 2); + list($host, $port) = explode('_', $hostname, 2); $rrd_filenames[] = $rrddir.'/'.$file; $rrd_list[$i]['filename'] = $rrddir.'/'.$file; $rrd_list[$i]['descr'] = $host.':'.$port; diff --git a/html/includes/graphs/application/shoutcast_multi_stats.inc.php b/html/includes/graphs/application/shoutcast_multi_stats.inc.php index 26b989c22a..a6618207e2 100644 --- a/html/includes/graphs/application/shoutcast_multi_stats.inc.php +++ b/html/includes/graphs/application/shoutcast_multi_stats.inc.php @@ -25,7 +25,7 @@ if ($handle = opendir($rrddir)) { foreach ($files as $id => $file) { $hostname = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file); $hostname = eregi_replace('.rrd', '', $hostname); - list($host, $port) = split('_', $hostname, 2); + list($host, $port) = explode('_', $hostname, 2); $rrd_filenames[] = $rrddir.'/'.$file; $rrd_list[$i]['filename'] = $rrddir.'/'.$file; $rrd_list[$i]['descr'] = $host.':'.$port; diff --git a/html/pages/device/apps/shoutcast.inc.php b/html/pages/device/apps/shoutcast.inc.php index 0eea369869..b5deb39eb8 100644 --- a/html/pages/device/apps/shoutcast.inc.php +++ b/html/pages/device/apps/shoutcast.inc.php @@ -42,7 +42,7 @@ if (isset($total) && $total === true) { foreach ($files as $id => $file) { $hostname = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file); $hostname = eregi_replace('.rrd', '', $hostname); - list($host, $port) = split('_', $hostname, 2); + list($host, $port) = explode('_', $hostname, 2); $graphs = array( 'shoutcast_bits' => 'Traffic Statistics - '.$host.' (Port: '.$port.')', 'shoutcast_stats' => 'Shoutcast Statistics - '.$host.' (Port: '.$port.')', diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php index b7cd309277..243f98a7de 100644 --- a/html/pages/settings/alerting.inc.php +++ b/html/pages/settings/alerting.inc.php @@ -307,7 +307,7 @@ echo ' '; $api_urls = get_config_like_name('alert.transports.api.%.'); foreach ($api_urls as $api_url) { - $api_split = split('\.', $api_url['config_name']); + $api_split = explode('.', $api_url['config_name']); $api_method = $api_split[3]; echo '
diff --git a/includes/polling/applications/shoutcast.inc.php b/includes/polling/applications/shoutcast.inc.php index 30428a6b6c..a5650d2569 100644 --- a/includes/polling/applications/shoutcast.inc.php +++ b/includes/polling/applications/shoutcast.inc.php @@ -15,7 +15,7 @@ foreach ($servers as $item => $server) { if (!empty($server)) { $data = explode(';', $server); - list($host, $port) = split(':', $data['0'], 2); + list($host, $port) = explode(':', $data['0'], 2); $bitrate = $data['1']; $traf_in = $data['2']; $traf_out = $data['3']; diff --git a/includes/polling/os/netapp.inc.php b/includes/polling/os/netapp.inc.php index c197763924..4273e2e8e4 100644 --- a/includes/polling/os/netapp.inc.php +++ b/includes/polling/os/netapp.inc.php @@ -2,5 +2,5 @@ $serial = snmp_get($device, 'productSerialNum.0', '-Ovq', 'NETAPP-MIB'); $hardware = snmp_get($device, 'productModel.0', '-Ovq', 'NETAPP-MIB'); -list($version,) = split(':', snmp_get($device, 'productVersion.0', '-Ovq', 'NETAPP-MIB')); +list($version,) = explode(':', snmp_get($device, 'productVersion.0', '-Ovq', 'NETAPP-MIB')); $version = str_replace('NetApp Release ', '', $version); diff --git a/includes/polling/temperatures/netapp.inc.php b/includes/polling/temperatures/netapp.inc.php index 015c40a430..d8841b7368 100644 --- a/includes/polling/temperatures/netapp.inc.php +++ b/includes/polling/temperatures/netapp.inc.php @@ -2,5 +2,5 @@ $sensor_value = trim(str_replace('"', '', snmp_get($device, $sensor['sensor_oid'], '-OUqnv', ''))); preg_match_all('/([0-9]+C)+/', $sensor_value, $temps); -list(,$index) = split('\.', $sensor['sensor_index']); +list(,$index) = explode('.', $sensor['sensor_index']); $sensor_value = $temps[0][$index]; diff --git a/includes/services/dns/check.inc b/includes/services/dns/check.inc index 0b259d68dc..ed6fba7241 100644 --- a/includes/services/dns/check.inc +++ b/includes/services/dns/check.inc @@ -6,7 +6,7 @@ if ($service['service_ip']) { $resolver = $service['service_ip']; } else { $check = shell_exec($config['nagios_plugins'] . "/check_dns -H ".$nsquery." -s ".$resolver); -list($check, $time) = split("\|", $check); +list($check, $time) = explode("|", $check); if(strstr($check, "DNS OK: ")) { $status = '1'; diff --git a/includes/services/domain_expire/check.inc b/includes/services/domain_expire/check.inc index f468e45d1a..aec6c48679 100644 --- a/includes/services/domain_expire/check.inc +++ b/includes/services/domain_expire/check.inc @@ -10,7 +10,7 @@ if( $service['service_ip'] ) { $cmd .= " ".$service['service_param']; $check = shell_exec($cmd); -list($check, $time) = split("\|", $check); +list($check, $time) = explode("|", $check); if(strstr($check, "OK - Domain")) { $status = '1'; diff --git a/includes/services/ftp/check.inc b/includes/services/ftp/check.inc index 67a8bed09f..1ac1a4df9f 100644 --- a/includes/services/ftp/check.inc +++ b/includes/services/ftp/check.inc @@ -2,7 +2,7 @@ $check = shell_exec($config['nagios_plugins'] . "/check_ftp -H ".$service['hostname']); -list($check, $time) = split("\|", $check); +list($check, $time) = explode("|", $check); if(strstr($check, "FTP OK - ")) { $status = '1'; diff --git a/includes/services/http/check.inc b/includes/services/http/check.inc index 1a686865e4..5c9067e8c5 100644 --- a/includes/services/http/check.inc +++ b/includes/services/http/check.inc @@ -2,7 +2,7 @@ $check = shell_exec($config['nagios_plugins'] . "/check_http -H ".$service['hostname']." ".$service['service_param']); -list($check, $time) = split("\|", $check); +list($check, $time) = explode("|", $check); if(strstr($check, "HTTP OK")) { $status = '1'; diff --git a/includes/services/icmp/check.inc b/includes/services/icmp/check.inc index f7e8bd823e..9d96d502c0 100644 --- a/includes/services/icmp/check.inc +++ b/includes/services/icmp/check.inc @@ -1,7 +1,7 @@ $server) { - list($host, $port) = split(":", $server, 2); + list($host, $port) = explode(":", $server, 2); array_push($data, get_data(trim($host), trim($port))); } return $data;