(dashboard, widgets) refactor traffic_graphs.widget.php

src/www/widgets/api/plugins/traffic.inc

+<?php
+/*
+    Copyright (C) 2016 Deciso B.V.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+function traffic_api()
+{
+    global $config;
+    $result = array();
+    $result['interfaces'] = legacy_interface_stats();
+    $temp = gettimeofday();
+    $result['time'] = (double)$temp["sec"] + (double)$temp["usec"] / 1000000.0;
+    // collect user friendly interface names
+    foreach ($config['interfaces'] as $interfaceKey => $interfaceData) {
+        if (array_key_exists($interfaceData['if'], $result['interfaces'])) {
+            $result['interfaces'][$interfaceData['if']]['name'] = !empty($interfaceData['descr']) ? $interfaceData['descr'] : $interfaceKey;
+        }
+    }
+    if (!empty($result['interfaces']['enc0'])) {
+        $result['interfaces']['enc0']['name'] = "IPsec";
+    }
+    return $result;
+}

src/www/widgets/javascript/traffic_graph.js

-function trafficshowDiv(incDiv,swapButtons){
-	//appear element
-	selectedDiv = incDiv + "graphdiv";
-	jQuery('#' + selectedDiv).show();
-	d = document;
-	if (swapButtons){
-		selectIntLink = selectedDiv + "-min";
-		textlink = d.getElementById(selectIntLink);
-		textlink.style.display = "inline";
-
-		selectIntLink = selectedDiv + "-open";
-		textlink = d.getElementById(selectIntLink);
-		textlink.style.display = "none";
-	}
-	document.iform["shown[" + incDiv + "]"].value = "show";
-}
-
-function  trafficminimizeDiv(incDiv,swapButtons){
-	//fade element
-	selectedDiv = incDiv + "graphdiv";
-	jQuery('#' + selectedDiv).hide();
-	d = document;
-	if (swapButtons){
-		selectIntLink = selectedDiv + "-open";
-		textlink = d.getElementById(selectIntLink);
-		textlink.style.display = "inline";
-
-		selectIntLink = selectedDiv + "-min";
-		textlink = d.getElementById(selectIntLink);
-		textlink.style.display = "none";
-	}
-	document.iform["shown[" + incDiv + "]"].value = "hide";
-}