Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 3091 → Rev 3106

/web/acc/manager/vnstat/includes/config.php
17,9 → 17,10
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
 
// Disable error reporting to screen
ini_set('display_errors', 0);
error_reporting(E_ALL);
// Uncomment to enable error reporting to the screen
/*ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ferror_reporting(E_ALL);*/
 
// Set the default system Timezone
date_default_timezone_set('Europe/London');
27,6 → 28,12
// Path of vnstat
$vnstat_bin_dir = '/usr/bin/vnstat';
 
// Path of config file
/*$vnstat_config = '/etc/vnstat.conf';*/
 
// linear or logarithmic graphs. Uncomment for logarithmic
/*$graph_type = 'log';*/
 
// Set to true to set your own interfaces
$use_predefined_interfaces = false;
 
/web/acc/manager/vnstat/includes/utilities.php
17,6 → 17,19
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
 
$logk = log(1024);
 
function getScale($bytes)
{
global $logk;
 
$ui = floor(round(log($bytes)/$logk,3));
if ($ui < 0) { $ui = 0; }
if ($ui > 8) { $ui = 8; }
 
return $ui;
}
 
// Get the largest value in an array
function getLargestValue($array) {
return $max = array_reduce($array, function ($a, $b) {
24,7 → 37,44
});
}
 
function formatSize($bytes, $vnstatJsonVersion) {
function getBaseValue($array, $scale)
{
$big = pow(1024,9);
 
// Find the smallest non-zero value
$sml = array_reduce($array, function ($a, $b) {
if ((1 <= $b['rx']) && ($b['rx'] < $b['tx'])) {
$sm = $b['rx'];
} else {
$sm = $b['tx'];
}
if (($sm < 1) || ($a < $sm)) {
return $a;
} else {
return $sm;
}
}, $big);
 
if ($sml >= $big/2) {
$sml = 1;
}
 
// divide by scale then round down to a power of 10
$base = pow(10,floor(round(log10($sml/pow(1024,$scale)),3)));
 
// convert back to bytes
$baseByte = $base * pow(1024, $scale);
 
// Don't make the bar invisable - must be > 5% difference
if ($sml / $baseByte < 1.05) {
$base = $base / 10;
}
 
return $base;
}
 
function formatSize($bytes, $vnstatJsonVersion, $decimals = 2) {
 
// json version 1 = convert from KiB
// json version 2 = convert from bytes
if ($vnstatJsonVersion == 1) {
31,28 → 81,29
$bytes *= 1024; // convert from kibibytes to bytes
}
 
return formatBytes($bytes);
return formatBytes($bytes, $decimals);
}
 
function formatBytes($bytes, $decimals = 2) {
$base = log(floatval($bytes), 1024);
function getLargestPrefix($scale)
{
$suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
return $suffixes[$scale];
}
 
return round(pow(1024, $base - floor($base)), $decimals) .' '. $suffixes[floor($base)];
function formatBytes($bytes, $decimals = 3) {
 
$scale = getScale($bytes);
 
return round($bytes/pow(1024, $scale), $decimals) .' '. getLargestPrefix($scale);
}
 
function formatBytesTo($bytes, $delimiter, $decimals = 2) {
function formatBytesTo($bytes, $scale, $decimals = 4) {
 
if ($bytes == 0) {
return '0';
}
 
$k = 1024;
$dm = $decimals < 0 ? 0 : $decimals;
$sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 
$i = array_search($delimiter, $sizes);
 
return number_format(($bytes / pow($k, $i)), $decimals);
return number_format(($bytes / pow(1024, $scale)), $decimals, ".", "");
}
 
function kibibytesToBytes($kibibytes, $vnstatJsonVersion) {
63,20 → 114,6
}
}
 
function getLargestPrefix($kb)
{
$units = ['TB', 'GB', 'MB', 'KB', 'B'];
$scale = 1024 * 1024 * 1024 * 1024;
$ui = 0;
 
while ((($kb < $scale) && ($scale > 1))) {
$ui++;
$scale = $scale / 1024;
}
 
return $units[$ui];
}
 
function sortingFunction($item1, $item2) {
if ($item1['time'] == $item2['time']) {
return 0;
/web/acc/manager/vnstat/includes/vnstat.php
78,7 → 78,11
$vnstatInterfaces = [];
 
foreach($this->vnstatData['interfaces'] as $interface) {
if ($this->vnstatJsonVersion == 1) {
array_push($vnstatInterfaces, $interface['id']);
} else {
array_push($vnstatInterfaces, $interface['name']);
}
}
 
return $vnstatInterfaces;
87,6 → 91,7
public function getInterfaceData($timeperiod, $type, $interface) {
// If json version equals 1, add an 's' onto the end of each type.
// e.g. 'top' becomes 'tops'
$typeAppend = '';
if ($this->vnstatJsonVersion == 1) {
$typeAppend = 's';
}
93,9 → 98,14
 
// Blank placeholder
$trafficData = [];
$i = -1;
 
// Get the array index for the chosen interface
$arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id'));
if ($this->vnstatJsonVersion == 1) {
$arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'id'));
} else {
$arrayIndex = array_search($interface, array_column($this->vnstatData['interfaces'], 'name'));
}
if ($timeperiod == 'top10') {
if ($type == 'table') {
113,6 → 123,34
}
}
 
if (($this->vnstatJsonVersion > 1) && ($timeperiod == 'five')) {
if ($type == 'table') {
foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) {
if (is_array($traffic)) {
$i++;
 
$trafficData[$i]['label'] = date("d/m/Y H:i", mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']));
$trafficData[$i]['time'] = mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']);
$trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
}
}
} else if ($type == 'graph') {
foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['fiveminute'] as $traffic) {
if (is_array($traffic)) {
$i++;
 
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $traffic['time']['hour'], $traffic['time']['minute']);
$trafficData[$i]['time'] = mktime($traffic['time']['hour'], $traffic['time']['minute'], 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']);
$trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
}
}
}
}
 
if ($timeperiod == 'hourly') {
if ($type == 'table') {
foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) {
133,7 → 171,6
}
}
 
// usort($trafficData, sortingFunction);
 
} else if ($type == 'graph') {
foreach ($this->vnstatData['interfaces'][$arrayIndex]['traffic']['hour'.$typeAppend] as $traffic) {
146,7 → 183,8
$hour = $traffic['time']['hour'];
}
 
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour, 0, 0);
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], $hour);
$trafficData[$i]['time'] = mktime($hour, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']);
$trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
162,6 → 200,7
$i++;
 
$trafficData[$i]['label'] = date('d/m/Y', mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']));
$trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']);
$trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
172,7 → 211,8
if (is_array($traffic)) {
$i++;
 
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day'], 0, 0, 0);
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d)", $traffic['date']['year'], $traffic['date']['month']-1, $traffic['date']['day']);
$trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], $traffic['date']['day'], $traffic['date']['year']);
$trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
188,6 → 228,7
$i++;
 
$trafficData[$i]['label'] = date('F Y', mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']));
$trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']);
$trafficData[$i]['rx'] = formatSize($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = formatSize($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = formatSize(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
198,7 → 239,8
if (is_array($traffic)) {
$i++;
 
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d, %d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10, 0, 0, 0);
$trafficData[$i]['label'] = sprintf("Date(%d, %d, %d)", $traffic['date']['year'], $traffic['date']['month'] - 1, 10);
$trafficData[$i]['time'] = mktime(0, 0, 0, $traffic['date']['month'], 10, $traffic['date']['year']);
$trafficData[$i]['rx'] = kibibytesToBytes($traffic['rx'], $this->vnstatJsonVersion);
$trafficData[$i]['tx'] = kibibytesToBytes($traffic['tx'], $this->vnstatJsonVersion);
$trafficData[$i]['total'] = kibibytesToBytes(($traffic['rx'] + $traffic['tx']), $this->vnstatJsonVersion);
207,17 → 249,32
}
}
 
if ($timeperiod != 'top10') {
usort($trafficData, 'sortingFunction');
}
 
if ($type == 'graph') {
// Get the largest value and then prefix (B, KB, MB, GB, etc)
$trafficLargestValue = getLargestValue($trafficData);
$trafficLargestPrefix = getLargestPrefix($trafficLargestValue);
$trafficScale = getScale($trafficLargestValue);
$trafficLargestPrefix = getLargestPrefix($trafficScale);
$trafficBase = getBaseValue($trafficData, $trafficScale);
if (($trafficBase < .0099) && ($trafficScale >= 1))
{
$trafficScale = $trafficScale - 1;
$trafficLargestPrefix = getLargestPrefix($trafficScale);
$trafficBase = getBaseValue($trafficData, $trafficScale);
}
 
foreach($trafficData as $key => $value) {
$trafficData[$key]['rx'] = formatBytesTo($value['rx'], $trafficLargestPrefix);
$trafficData[$key]['tx'] = formatBytesTo($value['tx'], $trafficLargestPrefix);
$trafficData[$key]['total'] = formatBytesTo($value['total'], $trafficLargestPrefix);
$trafficData[$key]['delimiter'] = $trafficLargestPrefix;
foreach($trafficData as &$value) {
$value['rx'] = formatBytesTo($value['rx'], $trafficScale);
$value['tx'] = formatBytesTo($value['tx'], $trafficScale);
$value['total'] = formatBytesTo($value['total'], $trafficScale);
}
 
unset($value);
$trafficData[0]['delimiter'] = $trafficLargestPrefix;
$trafficData[0]['base'] = $trafficBase;
}
 
return $trafficData;