nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding style part 2

Browse Source
This commit is contained in:
Job Snijders
2015-07-13 20:10:26 +02:00
parent ad9590df9b
commit d8693f05ae
733 changed files with 37359 additions and 33947 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/storage.inc.php
+56 -49
View File
@@ -1,14 +1,14 @@
<?php
$graph_type = "storage_usage";
$graph_type = 'storage_usage';
$where = 1;
$sql = " FROM `storage` AS `S` LEFT JOIN `devices` AS `D` ON `S`.`device_id` = `D`.`device_id`";
$sql = ' FROM `storage` AS `S` LEFT JOIN `devices` AS `D` ON `S`.`device_id` = `D`.`device_id`';
if (is_admin() === FALSE && is_read() === FALSE) {
$sql .= " LEFT JOIN `devices_perms` AS `DP` ON `S`.`device_id` = `DP`.`device_id`";
$where .= " AND `DP`.`user_id`=?";
if (is_admin() === false && is_read() === false) {
$sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `S`.`device_id` = `DP`.`device_id`';
$where .= ' AND `DP`.`user_id`=?';
$param[] = $_SESSION['user_id'];
}
@@ -20,7 +20,7 @@ if (isset($searchPhrase) && !empty($searchPhrase)) {
$count_sql = "SELECT COUNT(`storage_id`) $sql";
$count = dbFetchCell($count_sql,$param);
$count = dbFetchCell($count_sql, $param);
if (empty($count)) {
$count = 0;
}
@@ -32,7 +32,7 @@ if (!isset($sort) || empty($sort)) {
$sql .= " ORDER BY $sort";
if (isset($current)) {
$limit_low = ($current * $rowCount) - ($rowCount);
$limit_low = (($current * $rowCount) - ($rowCount));
$limit_high = $rowCount;
}
@@ -42,50 +42,57 @@ if ($rowCount != -1) {
$sql = "SELECT * $sql";
foreach (dbFetchRows($sql,$param) as $drive) {
foreach (dbFetchRows($sql, $param) as $drive) {
$perc = round($drive['storage_perc'], 0);
$total = formatStorage($drive['storage_size']);
$free = formatStorage($drive['storage_free']);
$used = formatStorage($drive['storage_used']);
$perc = round($drive['storage_perc'], 0);
$total = formatStorage($drive['storage_size']);
$free = formatStorage($drive['storage_free']);
$used = formatStorage($drive['storage_used']);
$graph_array['type'] = $graph_type;
$graph_array['id'] = $drive['storage_id'];
$graph_array['from'] = $config['time']['day'];
$graph_array['to'] = $config['time']['now'];
$graph_array['height'] = '20';
$graph_array['width'] = '80';
$graph_array_zoom = $graph_array;
$graph_array_zoom['height'] = '150';
$graph_array_zoom['width'] = '400';
$link = 'graphs/id='.$graph_array['id'].'/type='.$graph_array['type'].'/from='.$graph_array['from'].'/to='.$graph_array['to'].'/';
$mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), null);
$background = get_percentage_colours($perc);
$bar_link = overlib_link($link, print_percentage_bar(400, 20, $perc, "$used / $total", 'ffffff', $background['left'], $free, 'ffffff', $background['right']), generate_graph_tag($graph_array_zoom), null);
$graph_array['type'] = $graph_type;
$graph_array['id'] = $drive['storage_id'];
$graph_array['from'] = $config['time']['day'];
$graph_array['to'] = $config['time']['now'];
$graph_array['height'] = "20";
$graph_array['width'] = "80";
$graph_array_zoom = $graph_array;
$graph_array_zoom['height'] = "150";
$graph_array_zoom['width'] = "400";
$link = "graphs/id=" . $graph_array['id'] . "/type=" . $graph_array['type'] . "/from=" . $graph_array['from'] . "/to=" . $graph_array['to'] . "/";
$mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL);
$background = get_percentage_colours($perc);
$bar_link = overlib_link($link, print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $free, "ffffff", $background['right']), generate_graph_tag($graph_array_zoom), NULL);
$response[] = array(
'hostname' => generate_device_link($drive),
'storage_descr' => $drive['storage_descr'],
'graph' => $mini_graph,
'storage_used' => $bar_link,
'storage_perc' => $perc.'%',
);
if ($_POST['view'] == 'graphs') {
$graph_array['height'] = '100';
$graph_array['width'] = '216';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $drive['storage_id'];
$graph_array['type'] = $graph_type;
$response[] = array('hostname' => generate_device_link($drive),
'storage_descr' => $drive['storage_descr'],
'graph' => $mini_graph,
'storage_used' => $bar_link,
'storage_perc' => $perc . "%");
if ($_POST['view'] == "graphs") {
$graph_array['height'] = "100";
$graph_array['width'] = "216";
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $drive['storage_id'];
$graph_array['type'] = $graph_type;
$return_data = true;
include 'includes/print-graphrow.inc.php';
unset($return_data);
$response[] = array(
'hostname' => $graph_data[0],
'storage_descr' => $graph_data[1],
'graph' => $graph_data[2],
'storage_used' => $graph_data[3],
'storage_perc' => '',
);
} //end if
}//end foreach
$return_data = true;
include("includes/print-graphrow.inc.php");
unset($return_data);
$response[] = array('hostname' => $graph_data[0],
'storage_descr' => $graph_data[1],
'graph' => $graph_data[2],
'storage_used' => $graph_data[3],
'storage_perc' => '');
} # endif graphs
}
$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$count);
$output = array(
'current' => $current,
'rowCount' => $rowCount,
'rows' => $response,
'total' => $count,
);
echo _json_encode($output);