Merge pull request #3417 from murrant/php7

Improve PHP7 compatibility
librenms · Apr 24, 2016 · 7f50eca · 7f50eca
2 parents 413d0b7 + b98ba8c
commit 7f50eca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/html/includes/graphs/application/shoutcast_multi_bits.inc.php b/html/includes/graphs/application/shoutcast_multi_bits.inc.php
@@ -27,16 +27,16 @@
 if ($handle = opendir($rrddir)) {
     while (false !== ($file = readdir($handle))) {
         if ($file != '.' && $file != '..') {
-            if (eregi('app-shoutcast-'.$app['app_id'], $file)) {
+            if (stripos($file, 'app-shoutcast-'.$app['app_id'])) {
                 array_push($files, $file);
             }
         }
     }
 }
 
 foreach ($files as $id => $file) {
-    $hostname                 = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file);
-    $hostname                 = eregi_replace('.rrd', '', $hostname);
+    $hostname                 = str_ireplace('app-shoutcast-'.$app['app_id'].'-', '', $file);
+    $hostname                 = str_ireplace('.rrd', '', $hostname);
     list($host, $port)        = explode('_', $hostname, 2);
     $rrd_filenames[]          = $rrddir.'/'.$file;
     $rrd_list[$i]['filename'] = $rrddir.'/'.$file;

diff --git a/html/includes/graphs/application/shoutcast_multi_stats.inc.php b/html/includes/graphs/application/shoutcast_multi_stats.inc.php
@@ -15,16 +15,16 @@
 if ($handle = opendir($rrddir)) {
     while (false !== ($file = readdir($handle))) {
         if ($file != '.' && $file != '..') {
-            if (eregi('app-shoutcast-'.$app['app_id'], $file)) {
+            if (stripos($file, 'app-shoutcast-'.$app['app_id'])) {
                 array_push($files, $file);
             }
         }
     }
 }
 
 foreach ($files as $id => $file) {
-    $hostname                 = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file);
-    $hostname                 = eregi_replace('.rrd', '', $hostname);
+    $hostname                 = str_ireplace('app-shoutcast-'.$app['app_id'].'-', '', $file);
+    $hostname                 = str_ireplace('.rrd', '', $hostname);
     list($host, $port)        = explode('_', $hostname, 2);
     $rrd_filenames[]          = $rrddir.'/'.$file;
     $rrd_list[$i]['filename'] = $rrddir.'/'.$file;

diff --git a/html/pages/device/apps/shoutcast.inc.php b/html/pages/device/apps/shoutcast.inc.php
@@ -10,7 +10,7 @@
 if ($handle = opendir($rrddir)) {
     while (false !== ($file = readdir($handle))) {
         if ($file != '.' && $file != '..') {
-            if (eregi('app-shoutcast-'.$app['app_id'], $file)) {
+            if (stripos($file, 'app-shoutcast-'.$app['app_id']) !== false) {
                 array_push($files, $file);
             }
         }
@@ -45,8 +45,8 @@
 }
 
 foreach ($files as $id => $file) {
-    $hostname          = eregi_replace('app-shoutcast-'.$app['app_id'].'-', '', $file);
-    $hostname          = eregi_replace('.rrd', '', $hostname);
+    $hostname          = str_ireplace('app-shoutcast-'.$app['app_id'].'-', '', $file);
+    $hostname          = str_ireplace('.rrd', '', $hostname);
     list($host, $port) = explode('_', $hostname, 2);
     $graphs            = array(
         'shoutcast_bits'  => 'Traffic Statistics - '.$host.' (Port: '.$port.')',

diff --git a/html/pages/front/map.php b/html/pages/front/map.php
@@ -157,7 +157,7 @@
 //From default.php - This code is not part of above license.
 if ($config['enable_syslog']) {
 $sql = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog ORDER BY seq DESC LIMIT 20";
-$query = mysql_query($sql);
+
 echo('<div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
@@ -196,8 +196,6 @@
     P.device_id AND P.user_id = " . $_SESSION['user_id'] . " ORDER BY `datetime` DESC LIMIT 0,15";
   }
 
-  $data = mysql_query($query);
-
   echo('<div class="container-fluid">
           <div class="row">
             <div class="col-md-12">

diff --git a/includes/common.php b/includes/common.php
@@ -699,8 +699,8 @@ function get_smokeping_files($device) {
         if ($handle = opendir($smokeping_dir)) {
             while (false !== ($file = readdir($handle))) {
                 if ($file != '.' && $file != '..') {
-                    if (eregi('.rrd', $file)) {
-                        if (eregi('~', $file)) {
+                    if (stripos($file, '.rrd') !== false) {
+                        if (strpos($file, '~') !== false) {
                             list($target,$slave) = explode('~', str_replace('.rrd', '', $file));
                             $target = str_replace('_', '.', $target);
                             $smokeping_files['in'][$target][$slave] = $file;

diff --git a/irc.php b/irc.php
@@ -416,7 +416,7 @@ private function log($msg) {
 
     private function chkdb() {
         if (!is_resource($this->sql)) {
-            if (($this->sql = mysql_connect($this->config['db_host'], $this->config['db_user'], $this->config['db_pass'])) != false && mysql_select_db($this->config['db_name'])) {
+            if (($this->sql = mysqli_connect($this->config['db_host'], $this->config['db_user'], $this->config['db_pass'])) != false && mysqli_select_db($this->sql, $this->config['db_name'])) {
                 return true;
             }
             else {

diff --git a/scripts/ntpd-server.php b/scripts/ntpd-server.php
@@ -25,7 +25,7 @@
 $vars  = array();
 $vars2 = array();
 $vars  = explode(',', $cmd);
-$vars2 = eregi_replace(' ', '', $cmd2);
+$vars2 = str_replace(' ', '', $cmd2);
 $vars2 = explode("\n", $vars2);