nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +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-14 17:41:54 +02:00
parent ad9590df9b
commit 361653aa81
731 changed files with 37529 additions and 33991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/devices.inc.php
+228 -197
View File
@@ -2,7 +2,9 @@
// Set Defaults here
if(!isset($vars['format'])) { $vars['format'] = "list_detail"; }
if(!isset($vars['format'])) {
$vars['format'] = "list_detail";
}
$pagetitle[] = "Devices";
@@ -10,23 +12,19 @@ print_optionbar_start();
echo('<span style="font-weight: bold;">Lists</span> &#187; ');
$menu_options = array('basic' => 'Basic',
'detail' => 'Detail');
$menu_options = array('basic' => 'Basic', 'detail' => 'Detail');
$sep = "";
foreach ($menu_options as $option => $text)
{
echo($sep);
if ($vars['format'] == "list_".$option)
{
echo("<span class='pagemenu-selected'>");
}
echo('<a href="' . generate_url($vars, array('format' => "list_".$option)) . '">' . $text . '</a>');
if ($vars['format'] == "list_".$option)
{
echo("</span>");
}
$sep = " | ";
foreach ($menu_options as $option => $text) {
echo($sep);
if ($vars['format'] == "list_".$option) {
echo("<span class='pagemenu-selected'>");
}
echo('<a href="' . generate_url($vars, array('format' => "list_".$option)) . '">' . $text . '</a>');
if ($vars['format'] == "list_".$option) {
echo("</span>");
}
$sep = " | ";
}
?>
@@ -38,29 +36,26 @@ foreach ($menu_options as $option => $text)
<?php
$menu_options = array('bits' => 'Bits',
'processor' => 'CPU',
'ucd_load' => 'Load',
'mempool' => 'Memory',
'uptime' => 'Uptime',
'storage' => 'Storage',
'diskio' => 'Disk I/O',
'poller_perf' => 'Poller',
'ping_perf' => 'Ping'
);
'processor' => 'CPU',
'ucd_load' => 'Load',
'mempool' => 'Memory',
'uptime' => 'Uptime',
'storage' => 'Storage',
'diskio' => 'Disk I/O',
'poller_perf' => 'Poller',
'ping_perf' => 'Ping'
);
$sep = "";
foreach ($menu_options as $option => $text)
{
echo($sep);
if ($vars['format'] == 'graph_'.$option)
{
echo("<span class='pagemenu-selected'>");
}
echo('<a href="' . generate_url($vars, array('format' => 'graph_'.$option)) . '">' . $text . '</a>');
if ($vars['format'] == 'graph_'.$option)
{
echo("</span>");
}
$sep = " | ";
foreach ($menu_options as $option => $text) {
echo($sep);
if ($vars['format'] == 'graph_'.$option) {
echo("<span class='pagemenu-selected'>");
}
echo('<a href="' . generate_url($vars, array('format' => 'graph_'.$option)) . '">' . $text . '</a>');
if ($vars['format'] == 'graph_'.$option) {
echo("</span>");
}
$sep = " | ";
}
?>
@@ -69,21 +64,21 @@ foreach ($menu_options as $option => $text)
<?php
if (isset($vars['searchbar']) && $vars['searchbar'] == "hide")
{
if (isset($vars['searchbar']) && $vars['searchbar'] == "hide") {
echo('<a href="'. generate_url($vars, array('searchbar' => '')).'">Restore Search</a>');
} else {
}
else {
echo('<a href="'. generate_url($vars, array('searchbar' => 'hide')).'">Remove Search</a>');
}
}
echo(" | ");
echo(" | ");
if (isset($vars['bare']) && $vars['bare'] == "yes")
{
if (isset($vars['bare']) && $vars['bare'] == "yes") {
echo('<a href="'. generate_url($vars, array('bare' => '')).'">Restore Header</a>');
} else {
}
else {
echo('<a href="'. generate_url($vars, array('bare' => 'yes')).'">Remove Header</a>');
}
}
print_optionbar_end();
?>
@@ -94,76 +89,110 @@ print_optionbar_end();
list($format, $subformat) = explode("_", $vars['format'], 2);
if($format == "graph")
{
$sql_param = array();
if($format == "graph") {
$sql_param = array();
if(isset($vars['state']))
{
if($vars['state'] == 'up')
{
$state = '1';
}
elseif($vars['state'] == 'down')
{
$state = '0';
}
}
if(isset($vars['state'])) {
if($vars['state'] == 'up') {
$state = '1';
}
elseif($vars['state'] == 'down') {
$state = '0';
}
}
if (!empty($vars['hostname'])) { $where .= " AND hostname LIKE ?"; $sql_param[] = "%".$vars['hostname']."%"; }
if (!empty($vars['os'])) { $where .= " AND os = ?"; $sql_param[] = $vars['os']; }
if (!empty($vars['version'])) { $where .= " AND version = ?"; $sql_param[] = $vars['version']; }
if (!empty($vars['hardware'])) { $where .= " AND hardware = ?"; $sql_param[] = $vars['hardware']; }
if (!empty($vars['features'])) { $where .= " AND features = ?"; $sql_param[] = $vars['features']; }
if (!empty($vars['type'])) {
if ($vars['type'] == 'generic') {
$where .= " AND ( type = ? OR type = '')"; $sql_param[] = $vars['type'];
} else {
$where .= " AND type = ?"; $sql_param[] = $vars['type'];
}
}
if (!empty($vars['state'])) {
$where .= " AND status= ?"; $sql_param[] = $state;
$where .= " AND disabled='0' AND `ignore`='0'"; $sql_param[] = '';
}
if (!empty($vars['disabled'])) { $where .= " AND disabled= ?"; $sql_param[] = $vars['disabled']; }
if (!empty($vars['ignore'])) { $where .= " AND `ignore`= ?"; $sql_param[] = $vars['ignore']; }
if (!empty($vars['location']) && $vars['location'] == "Unset") { $location_filter = ''; }
if (!empty($vars['location'])) { $location_filter = $vars['location']; }
if( !empty($vars['group']) ) {
require_once('../includes/device-groups.inc.php');
$where .= " AND ( ";
foreach( GetDevicesFromGroup($vars['group']) as $dev ) {
$where .= "device_id = ? OR ";
$sql_param[] = $dev['device_id'];
}
$where = substr($where, 0, strlen($where)-3);
$where .= " )";
}
if (!empty($vars['hostname'])) {
$where .= " AND hostname LIKE ?";
$sql_param[] = "%".$vars['hostname']."%";
}
if (!empty($vars['os'])) {
$where .= " AND os = ?";
$sql_param[] = $vars['os'];
}
if (!empty($vars['version'])) {
$where .= " AND version = ?";
$sql_param[] = $vars['version'];
}
if (!empty($vars['hardware'])) {
$where .= " AND hardware = ?";
$sql_param[] = $vars['hardware'];
}
if (!empty($vars['features'])) {
$where .= " AND features = ?";
$sql_param[] = $vars['features'];
}
$query = "SELECT * FROM `devices` WHERE 1 ";
if (!empty($vars['type'])) {
if ($vars['type'] == 'generic') {
$where .= " AND ( type = ? OR type = '')";
$sql_param[] = $vars['type'];
}
else {
$where .= " AND type = ?";
$sql_param[] = $vars['type'];
}
}
if (!empty($vars['state'])) {
$where .= " AND status= ?";
$sql_param[] = $state;
$where .= " AND disabled='0' AND `ignore`='0'";
$sql_param[] = '';
}
if (!empty($vars['disabled'])) {
$where .= " AND disabled= ?";
$sql_param[] = $vars['disabled'];
}
if (!empty($vars['ignore'])) {
$where .= " AND `ignore`= ?";
$sql_param[] = $vars['ignore'];
}
if (!empty($vars['location']) && $vars['location'] == "Unset") {
$location_filter = '';
}
if (!empty($vars['location'])) {
$location_filter = $vars['location'];
}
if( !empty($vars['group']) ) {
require_once('../includes/device-groups.inc.php');
$where .= " AND ( ";
foreach( GetDevicesFromGroup($vars['group']) as $dev ) {
$where .= "device_id = ? OR ";
$sql_param[] = $dev['device_id'];
}
$where = substr($where, 0, strlen($where)-3);
$where .= " )";
}
if (isset($where)) {
$query .= $where;
}
$query = "SELECT * FROM `devices` WHERE 1 ";
$query .= " ORDER BY hostname";
if (isset($where)) {
$query .= $where;
}
$row = 1;
foreach (dbFetchRows($query, $sql_param) as $device)
{
if (is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$query .= " ORDER BY hostname";
if (device_permitted($device['device_id']))
{
if (!$location_filter || ((get_dev_attrib($device,'override_sysLocation_bool') && get_dev_attrib($device,'override_sysLocation_string') == $location_filter)
|| $device['location'] == $location_filter))
{
$graph_type = "device_".$subformat;
$row = 1;
foreach (dbFetchRows($query, $sql_param) as $device) {
if (is_integer($row/2)) {
$row_colour = $list_colour_a;
}
else {
$row_colour = $list_colour_b;
}
if ($_SESSION['widescreen']) { $width=270; } else { $width=315; }
if (device_permitted($device['device_id'])) {
if (!$location_filter || ((get_dev_attrib($device,'override_sysLocation_bool') && get_dev_attrib($device,'override_sysLocation_string') == $location_filter)
|| $device['location'] == $location_filter)) {
$graph_type = "device_".$subformat;
echo("<div style='display: block; padding: 1px; margin: 2px; min-width: ".($width+78)."px; max-width:".($width+78)."px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
if ($_SESSION['widescreen']) {
$width=270;
}
else {
$width=315;
}
echo("<div style='display: block; padding: 1px; margin: 2px; min-width: ".($width+78)."px; max-width:".($width+78)."px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
<a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\
<div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
<img src=\'graph.php?type=$graph_type&amp;device=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=450&amp;height=150&amp;title=yes\'>\
@@ -171,11 +200,11 @@ $query .= " ORDER BY hostname";
"<img src='graph.php?type=$graph_type&amp;device=".$device['device_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=".$width."&amp;height=110&amp;legend=no&amp;title=yes'>
</a>
</div>");
}
}
}
}
}
} else {
}
else {
?>
@@ -209,22 +238,23 @@ $query .= " ORDER BY hostname";
"<option value=''>All OSes</option>"+
<?php
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`";
} else {
$sql = "SELECT `os` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `os` ORDER BY `os`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['os']) {
$tmp_os = clean_bootgrid($data['os']);
echo('"<option value=\"'.$tmp_os.'\""+');
if ($tmp_os == $vars['os']) {
echo('" selected "+');
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`";
}
else {
$sql = "SELECT `os` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `os` ORDER BY `os`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['os']) {
$tmp_os = clean_bootgrid($data['os']);
echo('"<option value=\"'.$tmp_os.'\""+');
if ($tmp_os == $vars['os']) {
echo('" selected "+');
}
echo('">'.$config['os'][$tmp_os]['text'].'</option>"+');
}
echo('">'.$config['os'][$tmp_os]['text'].'</option>"+');
}
}
?>
"</select>"+
"</div>"+
@@ -233,22 +263,23 @@ foreach (dbFetch($sql,$param) as $data) {
"<option value=''>All Versions</option>"+
<?php
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`";
} else {
$sql = "SELECT `version` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `version` ORDER BY `version`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['version']) {
$tmp_version = clean_bootgrid($data['version']);
echo('"<option value=\"'.$tmp_version.'\""+');
if ($tmp_version == $vars['version']) {
echo('" selected "+');
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`";
}
else {
$sql = "SELECT `version` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `version` ORDER BY `version`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['version']) {
$tmp_version = clean_bootgrid($data['version']);
echo('"<option value=\"'.$tmp_version.'\""+');
if ($tmp_version == $vars['version']) {
echo('" selected "+');
}
echo('">'.$tmp_version.'</option>"+');
}
echo('">'.$tmp_version.'</option>"+');
}
}
}
?>
"</select>"+
"</div>"+
@@ -257,22 +288,23 @@ foreach (dbFetch($sql,$param) as $data) {
"<option value=\"\">All Platforms</option>"+
<?php
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`";
} else {
$sql = "SELECT `hardware` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `hardware` ORDER BY `hardware`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['hardware']) {
$tmp_hardware = clean_bootgrid($data['hardware']);
echo('"<option value=\"'.$tmp_hardware.'\""+');
if ($tmp_hardware == $vars['hardware']) {
echo('" selected"+');
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`";
}
else {
$sql = "SELECT `hardware` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `hardware` ORDER BY `hardware`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['hardware']) {
$tmp_hardware = clean_bootgrid($data['hardware']);
echo('"<option value=\"'.$tmp_hardware.'\""+');
if ($tmp_hardware == $vars['hardware']) {
echo('" selected"+');
}
echo('">'.$tmp_hardware.'</option>"+');
}
echo('">'.$tmp_hardware.'</option>"+');
}
}
?>
"</select>"+
@@ -282,24 +314,24 @@ foreach (dbFetch($sql,$param) as $data) {
"<option value=\"\">All Featuresets</option>"+
<?php
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `features` ORDER BY `features`";
} else {
$sql = "SELECT `features` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `features` ORDER BY `features`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data)
{
if ($data['features'])
{
$tmp_features = clean_bootgrid($data['features']);
echo('"<option value=\"'.$tmp_features.'\""+');
if ($tmp_features == $vars['features']) {
echo('" selected"+');
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `features` ORDER BY `features`";
}
echo('">'.$tmp_features.'</option>"+');
else {
$sql = "SELECT `features` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `features` ORDER BY `features`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['features']) {
$tmp_features = clean_bootgrid($data['features']);
echo('"<option value=\"'.$tmp_features.'\""+');
if ($tmp_features == $vars['features']) {
echo('" selected"+');
}
echo('">'.$tmp_features.'</option>"+');
}
}
}
?>
"</select>"+
@@ -311,16 +343,16 @@ foreach (dbFetch($sql,$param) as $data)
<?php
// fix me function?
foreach (getlocations() as $location) {
if ($location) {
$location = clean_bootgrid($location);
echo('"<option value=\"'.$location.'\""+');
if ($location == $vars['location']) {
echo('" selected"+');
foreach (getlocations() as $location) {
if ($location) {
$location = clean_bootgrid($location);
echo('"<option value=\"'.$location.'\""+');
if ($location == $vars['location']) {
echo('" selected"+');
}
echo('">'.$location.'</option>"+');
}
echo('">'.$location.'</option>"+');
}
}
?>
"</select>"+
"</div>"+
@@ -329,21 +361,22 @@ foreach (getlocations() as $location) {
"<option value=\"\">All Device Types</option>"+
<?php
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `type` FROM `devices` AS D WHERE 1 GROUP BY `type` ORDER BY `type`";
} else {
$sql = "SELECT `type` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `type` ORDER BY `type`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['type']) {
echo('"<option value=\"'.$data['type'].'\""+');
if ($data['type'] == $vars['type']) {
echo('" selected"+');
if (is_admin() === TRUE || is_read() === TRUE) {
$sql = "SELECT `type` FROM `devices` AS D WHERE 1 GROUP BY `type` ORDER BY `type`";
}
else {
$sql = "SELECT `type` FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` GROUP BY `type` ORDER BY `type`";
$param[] = $_SESSION['user_id'];
}
foreach (dbFetch($sql,$param) as $data) {
if ($data['type']) {
echo('"<option value=\"'.$data['type'].'\""+');
if ($data['type'] == $vars['type']) {
echo('" selected"+');
}
echo('">'.ucfirst($data['type']).'</option>"+');
}
echo('">'.ucfirst($data['type']).'</option>"+');
}
}
?>
"</select>"+
@@ -357,9 +390,9 @@ foreach (dbFetch($sql,$param) as $data) {
"<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>"
<?php
if (isset($vars['searchbar']) && $vars['searchbar'] == "hide") {
echo "searchbar = ''";
}
if (isset($vars['searchbar']) && $vars['searchbar'] == "hide") {
echo "searchbar = ''";
}
?>
var grid = $("#devices").bootgrid({
@@ -400,5 +433,3 @@ var grid = $("#devices").bootgrid({
<?php
}
?>