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

first PDO commit. make connection in static-config, use in /devices/

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2272 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-10 10:34:51 +00:00
parent 8c840da62d
commit 585e69c826
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/devices.inc.php
+10 -11
View File
@@ -27,8 +27,8 @@ print_optionbar_start(62);
<select name='os' id='os'>
<option value=''>All OSes</option>
<?php
$query = mysql_query("SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`");
while ($data = mysql_fetch_assoc($query))
foreach($db->query('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`') as $data)
{
if ($data['os'])
{
@@ -43,8 +43,8 @@ while ($data = mysql_fetch_assoc($query))
<select name='version' id='version'>
<option value=''>All Versions</option>
<?php
$query = mysql_query("SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`");
while ($data = mysql_fetch_assoc($query))
foreach($db->query('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`') as $data)
{
if ($data['version'])
{
@@ -60,8 +60,7 @@ while ($data = mysql_fetch_assoc($query))
<select name="hardware" id="hardware">
<option value="">All Platforms</option>
<?php
$query = mysql_query("SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`");
while ($data = mysql_fetch_assoc($query))
foreach($db->query('SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`') as $data)
{
if ($data['hardware'])
{
@@ -76,8 +75,8 @@ while ($data = mysql_fetch_assoc($query))
<select name="features" id="features">
<option value="">All Featuresets</option>
<?php
$query = mysql_query("SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `features` ORDER BY `features`");
while ($data = mysql_fetch_assoc($query))
foreach($db->query('SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `features` ORDER BY `features`') as $data)
{
if ($data['features'])
{
@@ -93,7 +92,8 @@ while ($data = mysql_fetch_assoc($query))
<select name="location" id="location">
<option value="">All Locations</option>
<?php
foreach (getlocations() as $location)
foreach (getlocations() as $location) ## FIXME function name sucks maybe get_locations ?
{
if ($location)
{
@@ -123,8 +123,7 @@ if ($_GET['status'] == "alerted")
echo('<table cellpadding="7" cellspacing="0" class="devicetable sortable" width="100%">
<tr class="tablehead"><th></th><th>Device</th><th></th><th>Operating System</th><th>Platform</th><th>Uptime/Location</th></tr>');
$device_query = mysql_query($sql);
while ($device = mysql_fetch_assoc($device_query))
foreach($db->query($sql) as $device)
{
if (device_permitted($device['device_id']))
{
includes/static-config.php
+7
View File
@@ -939,6 +939,13 @@ if (!$observium_link)
}
$observium_db = mysql_select_db($config['db_name'], $observium_link);
try {
$db = new PDO('mysql:host='.$config['db_host'].';dbname='.$config['db_name'], $config['db_user'], $config['db_pass']);
} catch (PDOException $e) {
print "Error!: " . $e->getMessage() . "<br/>";
die();
}
# Set some times needed by loads of scripts (it's dynamic, so we do it here!)
$now = time();