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

Fixed the discovered_last field update thing.

Browse Source
This commit is contained in:
mchasteen
2015-02-16 16:06:32 -07:00
committed by laf
parent c2ab3e1d0d
commit 4781e6d05e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/dbFacile.php
View File

@@ -120,7 +120,11 @@ function dbUpdate($data, $table, $where = null, $parameters = array()) {
// but how merge these field placeholders with actual $parameters array for the WHERE clause // but how merge these field placeholders with actual $parameters array for the WHERE clause
$sql = 'UPDATE `' . $table . '` SET '; $sql = 'UPDATE `' . $table . '` SET ';
foreach($data as $key => $value) { foreach($data as $key => $value) {
$sql .= "`".$key."` = '" . $value . "',"; if ($value == "NOW()") {
$sql .= "`".$key."` = " . $value . ",";
} else {
$sql .= "`".$key."` = '" . $value . "',";
}
} }
$sql = substr($sql, 0, -1); // strip off last comma $sql = substr($sql, 0, -1); // strip off last comma

2
includes/discovery/functions.inc.php
View File

@@ -119,7 +119,7 @@ function discover_device($device, $options = NULL)
$device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5); $device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5);
dbUpdate(array('last_discovered' => array('NOW()'), 'type' => $device['type'], 'last_discovered_timetaken' => $device_time), 'devices', '`device_id` = ?', array($device['device_id'])); dbUpdate(array('last_discovered' => 'NOW()', 'type' => $device['type'], 'last_discovered_timetaken' => $device_time), 'devices', '`device_id` = ?', array($device['device_id']));
echo("Discovered in $device_time seconds\n"); echo("Discovered in $device_time seconds\n");