Apply fixes from StyleCI (librenms#12121)

Author: Jellyfrog

includes/html/pages/bill.inc.php

@@ -83,7 +83,7 @@ function print_port_list($ports)
         }
 
         echo '</div></div>';
-    }//end print_port_list ?>
+    }//end print_port_list?>
 
     <h2><?php   echo "Bill: ${bill_data['bill_name']}"; ?></h2>
 
@@ -197,7 +197,7 @@ function print_port_list($ports)
             </td>
 
         <?php
-        }//end if ?>
+        }//end if?>
     </tr>
     </table>
 </div>

includes/html/pages/plugin/admin.inc.php

@@ -30,7 +30,7 @@
 </script>
 ';
         }
-    }//end if ?>
+    }//end if?>
 
 <div class="panel panel-default panel-condensed">
   <div class="panel-heading">

includes/polling/applications.inc.php

@@ -1,14 +1,14 @@
 <?php
 
-$app_rows = dbFetchRows('SELECT * FROM `applications` WHERE `device_id`  = ?', array($device['device_id']));
+$app_rows = dbFetchRows('SELECT * FROM `applications` WHERE `device_id`  = ?', [$device['device_id']]);
 
 if (count($app_rows) > 0) {
     foreach ($app_rows as $app) {
         $app_include = \LibreNMS\Config::get('install_dir') . '/includes/polling/applications/' . $app['app_type'] . '.inc.php';
         if (is_file($app_include)) {
             include $app_include;
         } else {
-            echo $app['app_type'].' include missing! ';
+            echo $app['app_type'] . ' include missing! ';
         }
     }
     echo "\n";

includes/polling/applications/apache.inc.php

@@ -5,22 +5,22 @@
 
 $name = 'apache';
 $app_id = $app['app_id'];
-if (!empty($agent_data['app'][$name])) {
+if (! empty($agent_data['app'][$name])) {
     $apache = $agent_data['app'][$name];
 } else {
     $options = '-Oqv';
-    $oid     = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.6.97.112.97.99.104.101';
-    $apache  = snmp_get($device, $oid, $options);
+    $oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.6.97.112.97.99.104.101';
+    $apache = snmp_get($device, $oid, $options);
 }
 
 echo ' apache';
 
-list ($total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec,
+[$total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec,
     $bytesperreq, $busyworkers, $idleworkers, $score_wait, $score_start,
     $score_reading, $score_writing, $score_keepalive, $score_dns,
-    $score_closing, $score_logging, $score_graceful, $score_idle, $score_open) = explode("\n", $apache);
+    $score_closing, $score_logging, $score_graceful, $score_idle, $score_open] = explode("\n", $apache);
 
-$rrd_name = array('app', $name, $app_id);
+$rrd_name = ['app', $name, $app_id];
 $rrd_def = RrdDefinition::make()
     ->addDataset('access', 'DERIVE', 0, 125000000000)
     ->addDataset('kbyte', 'DERIVE', 0, 125000000000)
@@ -43,28 +43,28 @@
     ->addDataset('sb_idle', 'GAUGE', 0, 125000000000)
     ->addDataset('sb_open', 'GAUGE', 0, 125000000000);
 
-$fields = array(
-                'access'       => intval(trim($total_access, '"')),
-                'kbyte'        => $total_kbyte,
-                'cpu'          => $cpuload,
-                'uptime'       => $uptime,
-                'reqpersec'    => $reqpersec,
-                'bytespersec'  => $bytespersec,
-                'byesperreq'   => $bytesperreq,
-                'busyworkers'  => $busyworkers,
-                'idleworkers'  => $idleworkers,
-                'sb_wait'      => $score_wait,
-                'sb_start'     => $score_start,
-                'sb_reading'   => $score_reading,
-                'sb_writing'   => $score_writing,
-                'sb_keepalive' => $score_keepalive,
-                'sb_dns'       => $score_dns,
-                'sb_closing'   => $score_closing,
-                'sb_logging'   => $score_logging,
-                'sb_graceful'  => $score_graceful,
-                'sb_idle'      => $score_idle,
-                'sb_open'      => intval(trim($score_open, '"')),
-);
+$fields = [
+    'access'       => intval(trim($total_access, '"')),
+    'kbyte'        => $total_kbyte,
+    'cpu'          => $cpuload,
+    'uptime'       => $uptime,
+    'reqpersec'    => $reqpersec,
+    'bytespersec'  => $bytespersec,
+    'byesperreq'   => $bytesperreq,
+    'busyworkers'  => $busyworkers,
+    'idleworkers'  => $idleworkers,
+    'sb_wait'      => $score_wait,
+    'sb_start'     => $score_start,
+    'sb_reading'   => $score_reading,
+    'sb_writing'   => $score_writing,
+    'sb_keepalive' => $score_keepalive,
+    'sb_dns'       => $score_dns,
+    'sb_closing'   => $score_closing,
+    'sb_logging'   => $score_logging,
+    'sb_graceful'  => $score_graceful,
+    'sb_idle'      => $score_idle,
+    'sb_open'      => intval(trim($score_open, '"')),
+];
 
 $tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
 data_update($device, 'app', $tags, $fields);

includes/polling/applications/asterisk.inc.php

@@ -7,27 +7,27 @@
 
 echo "$name, app_id=$app_id ";
 
-if (!empty($agent_data[$name])) {
+if (! empty($agent_data[$name])) {
     $rawdata = $agent_data[$name];
 } else {
     $options = '-Oqv';
     $oid = '.1.3.6.1.4.1.8072.1.3.2.4.1.2.8.97.115.116.101.114.105.115.107';
     $rawdata = snmp_walk($device, $oid, $options);
-    $rawdata  = str_replace("<<<asterisk>>>\n", '', $rawdata);
+    $rawdata = str_replace("<<<asterisk>>>\n", '', $rawdata);
 }
 
-# Format Data
+// Format Data
 $lines = explode("\n", $rawdata);
-$asterisk = array();
-$asterisk_metrics = array();
+$asterisk = [];
+$asterisk_metrics = [];
 foreach ($lines as $line) {
-    list($var,$value) = explode('=', $line);
+    [$var,$value] = explode('=', $line);
     $asterisk[$var] = $value;
 }
 unset($lines);
 
-# Asterisk stats
-$rrd_name =  array('app', $name, 'stats', $app_id);
+// Asterisk stats
+$rrd_name = ['app', $name, 'stats', $app_id];
 $rrd_def = RrdDefinition::make()
     ->addDataset('calls', 'GAUGE', 0, 10000)
     ->addDataset('channels', 'GAUGE', 0, 20000)
@@ -37,36 +37,36 @@
     ->addDataset('sipunmononline', 'GAUGE', 0, 10000)
     ->addDataset('sipunmonoffline', 'GAUGE', 0, 10000);
 
-$sip_fields = array(
+$sip_fields = [
     'calls' => $asterisk['Calls'],
     'channels' => $asterisk['Channels'],
     'sippeers' => $asterisk['SipPeers'],
     'sipmononline' => $asterisk['SipMonOnline'],
     'sipmonoffline' => $asterisk['SipMonOffline'],
     'sipunmononline' => $asterisk['SipUnMonOnline'],
-    'sipunmonoffline' => $asterisk['SipUnMonOffline']
-);
+    'sipunmonoffline' => $asterisk['SipUnMonOffline'],
+];
 
 $asterisk_metrics['stats'] = $sip_fields;
 $sip_tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
 data_update($device, 'app', $sip_tags, $sip_fields);
 
 unset($rrd_name, $rrd_def, $sip_fields, $sip_tags);
 
-# Additional iax2 stats
-$rrd_name =  array('app', $name, 'iax2', $app_id);
+// Additional iax2 stats
+$rrd_name = ['app', $name, 'iax2', $app_id];
 $rrd_def = RrdDefinition::make()
     ->addDataset('iax2peers', 'GAUGE', 0, 10000)
     ->addDataset('iax2online', 'GAUGE', 0, 10000)
     ->addDataset('iax2offline', 'GAUGE', 0, 10000)
     ->addDataset('iax2unmonitored', 'GAUGE', 0, 10000);
 
-$iax2_fields = array(
+$iax2_fields = [
     'iax2peers' => $asterisk['Iax2Peers'],
     'iax2online' => $asterisk['Iax2Online'],
     'iax2offline' => $asterisk['Iax2Offline'],
-    'iax2unmonitored' => $asterisk['Iax2Unmonitored']
-);
+    'iax2unmonitored' => $asterisk['Iax2Unmonitored'],
+];
 
 $asterisk_metrics['iax2'] = $iax2_fields;
 $iax2_tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');

includes/polling/applications/backupninja.inc.php

@@ -12,33 +12,34 @@
 } catch (JsonAppMissingKeysException $e) {
     $backupninja_data = $e->getParsedJson();
 } catch (JsonAppException $e) {
-    echo PHP_EOL . $name . ':' .$e->getCode().':'. $e->getMessage() . PHP_EOL;
-    update_application($app, $e->getCode().':'.$e->getMessage(), []); // Set empty metrics and error message
+    echo PHP_EOL . $name . ':' . $e->getCode() . ':' . $e->getMessage() . PHP_EOL;
+    update_application($app, $e->getCode() . ':' . $e->getMessage(), []); // Set empty metrics and error message
+
     return;
 }
 
-$metrics = array();
+$metrics = [];
 
 $category = 'overview';
-$rrd_name = array('app', $name, $app_id, $category);
+$rrd_name = ['app', $name, $app_id, $category];
 $rrd_def = RrdDefinition::make()
     ->addDataset('last_actions', 'GAUGE', 0)
     ->addDataset('last_fatal', 'GAUGE', 0)
     ->addDataset('last_error', 'GAUGE', 0)
     ->addDataset('last_warning', 'GAUGE', 0);
 
-$fields = array(
+$fields = [
     'last_actions'   => $backupninja_data['last_actions'],
     'last_fatal'     => $backupninja_data['last_fatal'],
     'last_error'     => $backupninja_data['last_error'],
     'last_warning'   => $backupninja_data['last_warning'],
-);
+];
 $metrics[$category] = $fields;
 
 // Debug
 d_echo("backupninja : $fields");
 
-$tags = array('name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name);
+$tags = ['name' => $name, 'app_id' => $app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
 data_update($device, 'app', $tags, $fields);
 
 update_application($app, $output, $metrics);