mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unify $os_group and $os_type into $config['os']

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1264 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-06-25 12:18:00 +00:00
parent b2cfd87081
commit 19ccf99d8f
9 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/pages/device.php
View File

@@ -17,7 +17,7 @@ $select[$section] = "selected";
$device_query = mysql_query("SELECT * FROM `devices` WHERE `device_id` = '" . $_GET['id'] . "'");
while($device = mysql_fetch_array($device_query)) {
if($os_groups[$device['os']]) {$device['os_group'] = $os_groups[$device['os']]; }
if($config['os'][$device['os']]['group']) {$device['os_group'] = $config['os'][$device['os']]['group']; }
echo('<table cellpadding="15" cellspacing="0" class="devicetable" width="100%">');
include("includes/device-header.inc.php");

2
html/pages/device/graphs.inc.php
View File

@@ -8,7 +8,7 @@ while ($device = mysql_fetch_array($device_query))
echo('<div style="clear: both;">');
if ($os_groups[$device['os']]) { $os_group = $os_groups[$device['os']]; }
if ($config['os'][$device['os']]['group']) { $os_group = $config['os'][$device['os']]['group']; }
if (is_file($config['install_dir'] . "/html/pages/device/graphs/os-".$device['os'].".inc.php")) {
/// OS Specific

2
html/pages/devices.php
View File

@@ -17,7 +17,7 @@
{
echo("<option value='".$data['os']."'");
if ($data['os'] == $_POST['os']) { echo(" selected"); }
echo(">".$os_text[$data['os']]."</option>");
echo(">".$config['os'][$data['os']]['text']."</option>");
}
}
?>