Merge branch 'master' of https://github.com/cardil/linux-dash into cardil-master

Author: tariqbuilds

index.html

@@ -243,7 +243,7 @@ <h3>
                                 <div class="widget-header">
                                     <i class="icon-list"></i>
                                     <h3>
-                                        DNS Leases
+                                        DHCP Leases
                                     </h3>
                                     <div id="refresh-dnsmasqleases" class="btn icon-refresh js-refresh-info"></div>
                                 </div><!-- /widget-header -->

js/dashboard.js

@@ -417,7 +417,7 @@ dashboard.getLoadAverage = function () {
 }
 
 dashboard.getDnsmasqLeases = function () {
-    $.get("sh/dnsmasq-leases.php", function (data) {
+    $.get("sh/dhcp-leases.php", function (data) {
         var table = $("#dnsmasqleases_dashboard");
         var ex = document.getElementById("dnsmasqleases_dashboard");
         if ($.fn.DataTable.fnIsDataTable(ex)) {
@@ -448,6 +448,7 @@ dashboard.getBandwidth = function () {
     $.ajax({
         url: 'sh/bandwidth.php',
         cache: false,
+        dataType: 'json',
         success: function (data) {
             $('#bw-tx').text(data.tx);
             $('#bw-rx').text(data.rx);

sh/bandwidth.php

@@ -3,15 +3,15 @@
     $tx_path = 'cat /sys/class/net/eth0/statistics/tx_bytes';
     $rx_path = 'cat /sys/class/net/eth0/statistics/rx_bytes';
 
-    $tx_start = shell_exec($tx_path);
-    $rx_start = shell_exec($rx_path);
+    $tx_start = intval(shell_exec($tx_path));
+    $rx_start = intval(shell_exec($rx_path));
 
     sleep(2);
 
-    $tx_end = shell_exec($tx_path);
-    $rx_end = shell_exec($rx_path);
+    $tx_end = intval(shell_exec($tx_path));
+    $rx_end = intval(shell_exec($rx_path));
 
-    $result['tx'] = ($tx_end - $tx_start)/2;
-    $result['rx'] = ($rx_end - $rx_start)/2;
+    $result['tx'] = ($tx_end - $tx_start);
+    $result['rx'] = ($rx_end - $rx_start);
 
     echo json_encode($result);

sh/dhcp-leases.php

@@ -0,0 +1,83 @@
+<?php
+
+// define the path to the DNSMasq Lease file
+$dnsmasq_lease_file = "/var/lib/misc/dnsmasq.leases";
+
+// build the results
+$results = array();
+
+// check if DNS MASQ file exists
+if (file_exists($dnsmasq_lease_file)) {
+
+    // get the contents of the lease file
+    $data = file_get_contents($dnsmasq_lease_file);
+
+    // separate it into lines
+    $data = explode("\n", $data);
+
+    // strip any blank lines
+    $data = array_filter($data, function ($v) {
+        return $v;
+    });
+
+    // step through the data
+    foreach ($data as $l) {
+        // explode each line of the data
+        $l = explode(" ", $l);
+
+        // remove the last field (I don't know what it is - for most of the
+        // lines it's simply "*", in other cases it's the host MAC address)
+        unset($l[4]);
+
+        // convert the timestamp to a readable date/time
+        $l[0] = date("m/j/Y H:i:s", $l[0]);
+
+        // add the line to the results
+        $results[] = $l;
+    }
+} else {
+    $fh=fopen("/var/lib/dhcp/dhcpd.leases","r");
+
+    while ($dat=fgets($fh)) {
+        if (preg_match("/lease.+{/",$dat)) {
+            $active=false;
+            $ip = preg_split("/ /",$dat);$ip=$ip[1];
+            $expires = '';
+            $dat=fgets($fh);
+            while (!preg_match("/hardware ethernet/",$dat) && !preg_match("/ends/",$dat)) {
+                $dat=fgets($fh);
+            }
+            if (preg_match("/ends/",$dat)) {
+               $expires = preg_replace("/.*ends\\s+\\d+\\s+(.+);.*/", '\1', $dat);
+               $ts = strtotime($expires);
+               $expires = date("m/j/Y H:i:s", $ts); 
+            }
+            $dat=fgets($fh);
+            while (!preg_match("/hardware ethernet/",$dat)) {
+                if (preg_match("/binding state active/",$dat)) {
+                    $active=true;
+                }
+                $dat=fgets($fh);
+            }
+            $mac = preg_split("/ |;/",$dat); $mac=$mac[4];
+            $host = '';
+            $dat=fgets($fh);
+            while (trim($dat) != "}" && !preg_match("/client-hostname/",$dat)) {
+                $dat=fgets($fh);
+            }
+            if (preg_match("/client-hostname/",$dat)) {
+               $host = preg_replace("/.*\"(.+)\".*/", '\1', $dat); 
+            }
+
+            if ($active) {
+                $results[$ip] = array($expires, $mac, $ip, $host);
+            }
+        }
+    }
+    sort($results);
+    $results = array_values($results);
+
+}
+
+// output the results
+echo json_encode($results);

sh/dnsmasq-leases.php

@@ -7,7 +7,7 @@
 );
 
 // get value via /proc/cpuinfo
-$numOfCores = shell_exec('/bin/grep -c ^processor /proc/cpuinfo');
+$numOfCores = shell_exec('LC_ALL=C /bin/grep -c ^processor /proc/cpuinfo');
 $numOfCores = filter_var(
     $numOfCores[0],
     FILTER_VALIDATE_INT,

sh/numberofcores.php

@@ -12,11 +12,11 @@
     	$binaries = explode(" ", "php node mysql vim python ruby java apache2 nginx openssl vsftpd make");
     }
 
-putenv('PATH=/usr/local/sbin:/usr/sbin:/sbin:' . getenv('PATH'));
+$path = 'PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:' . getenv('PATH');
 $data = array();
 foreach ($binaries as $b) {
     $which = array();
-    exec('command -v ' . escapeshellarg($b), $which, $return_var);
+    exec($path . ' command -v ' . escapeshellarg($b), $which, $return_var);
     $data[] = array($b, $return_var ? "Not Installed" : $which[0]);
 }