diff --git a/includes/polling/applications.inc.php b/includes/polling/applications.inc.php index fcd80f0a16..32c6c40572 100644 --- a/includes/polling/applications.inc.php +++ b/includes/polling/applications.inc.php @@ -2,12 +2,13 @@ $sql = "SELECT * FROM `applications` WHERE `device_id` = '".$device['device_id']."'"; if ($debug) { echo($sql."\n"); } -$app_data = mysql_query($sql); -if (mysql_affected_rows()) +$app_rows = dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array($device['device_id'])); + +if (count($app_rows)) { echo('Applications: '); - while ($app = mysql_fetch_assoc($app_data)) + foreach ($app_rows as $app) { $app_include = $config['install_dir'].'/includes/polling/applications/'.$app['app_type'].'.inc.php'; if (is_file($app_include)) @@ -22,4 +23,4 @@ if (mysql_affected_rows()) echo("\n"); } -?> \ No newline at end of file +?> diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php index 7e4afa00ea..13603d6aaa 100755 --- a/includes/polling/bgp-peers.inc.php +++ b/includes/polling/bgp-peers.inc.php @@ -1,5 +1,7 @@ \ No newline at end of file +?> diff --git a/includes/polling/cisco-cef.inc.php b/includes/polling/cisco-cef.inc.php index 7c528a28e2..44675d2bc5 100755 --- a/includes/polling/cisco-cef.inc.php +++ b/includes/polling/cisco-cef.inc.php @@ -21,7 +21,7 @@ if (is_array($cefs)) echo(" entPhysicalModelName"); $entity_array = snmpwalk_cache_multi_oid($device, "entPhysicalModelName", $entity_array, "ENTITY-MIB"); } - foreach ($cefs as $entity => $afis) + foreach ($cefs as $entity => $afis) { $entity_name = $entity_array[$entity]['entPhysicalName'] ." - ".$entity_array[$entity]['entPhysicalModelName']; echo("\n$entity $entity_name\n"); @@ -33,20 +33,13 @@ if (is_array($cefs)) echo(" | |-".$path.": ".$cef_stat['cefSwitchingPath']); - if(mysql_result(mysql_query("SELECT COUNT(*) FROM `cef_switching` WHERE `device_id` = '".$device['device_id']."' AND `entPhysicalIndex` = '".$entity."' - AND `afi` = '".$afi."' AND `cef_index` = '".$path."'"),0) != "1") + if(dbFetchCell("SELECT COUNT(*) FROM `cef_switching` WHERE `device_id` = ? AND `entPhysicalIndex` = ? AND `afi` = ? AND `cef_index` = ?", array($device['device_id'], $entity, $afi, $path)) != "1") { - $sql = "INSERT INTO `cef_switching` (`device_id`, `entPhysicalIndex`, `afi`, `cef_index`, `cef_path`) - VALUES ('".$device['device_id']."', '".$entity."', '".$afi."', '".$path."', '".$cef_stat['cefSwitchingPath']."')"; - mysql_query($sql); + dbInsert(array('device_id' => $device['device_id'], 'entPhysicalIndex' => $entity, 'afi' => $afi, 'cef_index' => $path, 'cef_path' => $cef_stat['cefSwitchingPath']), 'cef_switching'); echo("+"); } - $sql = "SELECT * FROM `cef_switching` WHERE `device_id` = '".$device['device_id']."' AND `entPhysicalIndex` = '".$entity."' - AND `afi` = '".$afi."' AND `cef_index` = '".$path."'"; - - $query = mysql_query($sql); - $cef_entry = mysql_fetch_assoc($query); + $cef_entry = dbFetchRow("SELECT * FROM `cef_switching` WHERE `device_id` = ? AND `entPhysicalIndex = ? AND `afi` = ? AND `cef_index` = ?", array($device['device_id'], $entity, $afi, $path)); $filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("cefswitching-".$entity."-".$afi."-".$path.".rrd"); @@ -67,22 +60,17 @@ if (is_array($cefs)) if (is_numeric($cef_stat['cefSwitchingHCPunt'])) { $cef_stat['cefSwitchingPunt'] = $cef_stat['cefSwitchingHCPunt']; } if (is_numeric($cef_stat['cefSwitchingHCPunt2Host'])) { $cef_stat['cefSwitchingPunt2Host'] = $cef_stat['cefSwitchingHCPunt2Host']; } - $update = " `drop` = '".$cef_stat['cefSwitchingDrop']."'"; - $update .= ", `punt` = '".$cef_stat['cefSwitchingPunt']."'"; - $update .= ", `punt2host` = '".$cef_stat['cefSwitchingPunt2Host']."'"; + $cef_stat['update']['drop'] = $cef_stat['cefSwitchingDrop']; + $cef_stat['update']['punt'] = $cef_stat['cefSwitchingPunt']; + $cef_stat['update']['punt2host'] = $cef_stat['cefSwitchingPunt2Host']; + $cef_stat['update']['drop_prev'] = $cef_entry['drop']; + $cef_stat['update']['punt_prev'] = $cef_entry['punt']; + $cef_stat['update']['punt2host_prev'] = $cef_entry['punt2host']; + $cef_stat['update']['updated'] = $polled; + $cef_stat['update']['updated_prev'] = $cef_entry['updated']; - $update .= ", `drop_prev` = '".$cef_entry['drop']."'"; - $update .= ", `punt_prev` = '".$cef_entry['punt']."'"; - $update .= ", `punt2host_prev` = '".$cef_entry['punt2host']."'"; + dbUpdate($cef_stat['update'], 'cef_switching', '`device_id` = ? AND `entPhysicalIndex` = ? AND `afi` = ? AND `cef_index` = ?', array($device['device_id'], $entity, $afi, $path)); - $update .= ", `updated` = '".$polled."'"; - $update .= ", `updated_prev` = '".$cef_entry['updated']."'"; - - $update_query = "UPDATE `cef_switching` SET ".$update." WHERE `device_id` = '".$device['device_id']."' AND `entPhysicalIndex` = '".$entity."' - AND `afi` = '".$afi."' AND `cef_index` = '".$path."'"; - @mysql_query($update_query); - if ($debug) {echo("\nMYSQL : [ $update_query ]"); } - $rrd_update = "N:".$cef_stat['cefSwitchingDrop'].":".$cef_stat['cefSwitchingPunt'].":".$cef_stat['cefSwitchingPunt2Host']; $ret = rrdtool_update("$filename", $rrd_update); diff --git a/includes/polling/cisco-entity-sensors.inc.php b/includes/polling/cisco-entity-sensors.inc.php deleted file mode 100755 index fb62bc06b9..0000000000 --- a/includes/polling/cisco-entity-sensors.inc.php +++ /dev/null @@ -1,51 +0,0 @@ - \ No newline at end of file diff --git a/includes/polling/cisco-mac-accounting.inc.php b/includes/polling/cisco-mac-accounting.inc.php index 6ab1109804..5a3d5a5b51 100755 --- a/includes/polling/cisco-mac-accounting.inc.php +++ b/includes/polling/cisco-mac-accounting.inc.php @@ -1,5 +1,7 @@ \ No newline at end of file +?> diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 57e9d17873..f17d49b8e3 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -4,10 +4,7 @@ function poll_sensor($device, $class, $unit) { global $config; - $query = "SELECT * FROM sensors WHERE sensor_class='$class' AND device_id = '" . $device['device_id'] . "' AND poller_type='snmp'"; - $sensor_data = mysql_query($query); - - while ($sensor = mysql_fetch_assoc($sensor_data)) + foreach (dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND `device_id` = ? AND `poller_type` = 'snmp'", array($class, $device['device_id'])) as $sensor) { echo("Checking $class " . $sensor['sensor_descr'] . "... "); @@ -82,7 +79,7 @@ function poll_sensor($device, $class, $unit) log_event(ucfirst($class) . ' ' . $sensor['sensor_descr'] . " above threshold: " . $sensor_value . " $unit (> " . $sensor['sensor_limit'] . " $unit)", $device, $class, $sensor['sensor_id']); } - mysql_query("UPDATE sensors SET sensor_current = '$sensor_value' WHERE sensor_class='$class' AND sensor_id = '" . $sensor['sensor_id'] . "'"); + dbUpdate(array('sensor_current' => $sensor_value), 'sensors', '`sensor_class` = ? AND `sensor_id` = ?', array($class, $sensor['sensor_id'])); } } diff --git a/includes/polling/ipmi.inc.php b/includes/polling/ipmi.inc.php index 584a025d98..c3b9e4b5b6 100644 --- a/includes/polling/ipmi.inc.php +++ b/includes/polling/ipmi.inc.php @@ -1,7 +1,6 @@ $sensor), 'sensors', 'poller_type = ? AND sensor_class = ? AND sensor_id = ?', array('ipmi', $ipmisensors['sensor_class'], $ipmisensors['sensor_id'])); + } unset($ipmi_sensor); } -?> \ No newline at end of file +?> diff --git a/includes/polling/junose-atm-vp.inc.php b/includes/polling/junose-atm-vp.inc.php index cb415aec3a..3e0d4c1ee1 100755 --- a/includes/polling/junose-atm-vp.inc.php +++ b/includes/polling/junose-atm-vp.inc.php @@ -1,9 +1,8 @@ \ No newline at end of file +?> diff --git a/includes/polling/mempools.inc.php b/includes/polling/mempools.inc.php index 9acb25108d..7777c10342 100755 --- a/includes/polling/mempools.inc.php +++ b/includes/polling/mempools.inc.php @@ -1,8 +1,6 @@ $mempool['used'], 'mempool_perc' => $percent, 'mempool_free' => $mempool['free'], + 'mempool_total' => $mempool['total'], 'mempool_largestfree' => $mempool['largestfree'], 'mempool_lowestfree' => $mempool['lowestfree']), + 'mempools', '`mempool_id` = ?', array($mempool['mempool_id'])); echo("\n"); } diff --git a/includes/polling/ospf.inc.php b/includes/polling/ospf.inc.php index e563556f51..17f2161f3b 100644 --- a/includes/polling/ospf.inc.php +++ b/includes/polling/ospf.inc.php @@ -13,8 +13,7 @@ $ospf_oids_db = array('ospfRouterId', 'ospfAdminStat', 'ospfVersionNumber', 'osp 'ospfExtLsdbLimit', 'ospfMulticastExtensions', 'ospfExitOverflowInterval', 'ospfDemandExtensions'); ### Build array of existing entries -$query = mysql_query("SELECT * FROM `ospf_instances` WHERE `device_id` = '".$device['device_id']."'"); -while ($entry = mysql_fetch_assoc($query)) +foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", array($device['device_id'])) as $entry) { $ospf_instances_db[$entry['ospf_instance_id']] = $entry; } @@ -26,12 +25,9 @@ foreach ($ospf_instances_poll as $ospf_instance_id => $ospf_entry) ### If the entry doesn't already exist in the prebuilt array, insert into the database and put into the array if (!isset($ospf_instances_db[$ospf_instance_id])) { - $query = "INSERT INTO `ospf_instances` (`device_id`, `ospf_instance_id`) VALUES ('".$device['device_id']."','".$ospf_instance_id."')"; - if ($debug) { echo($query); } - mysql_query($query); - if ($debug) { echo(mysql_error()); } + dbInsert(array('device_id' => $device['device_id'], 'ospf_instance_id' => $ospf_instance_id), 'ospf_instances'); echo("+"); - $entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_instances` WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'")); + $ospf_instances_db[$entry['ospf_instance_id']] = dbFetchRow("SELECT * FROM `ospf_instances` WHERE `device_id` = ? AND `ospf_instance_id` = ?", array($device['device_id'],$ospf_instance_id)); $ospf_instances_db[$entry['ospf_instance_id']] = $entry; } } @@ -55,16 +51,13 @@ if (is_array($ospf_instances_db)) { // Loop the OIDs if ($ospf_instance_db[$oid] != $ospf_instance_poll[$oid]) { // If data has changed, build a query - $ospf_instance_update .= ", `$oid` = '".mres($ospf_instance_poll[$oid])."'"; + $ospf_instance_update[$oid] = $ospf_instance_poll[$oid]; #log_event("$oid -> ".$this_port[$oid], $device, 'ospf', $port['interface_id']); ## FIXME } } if ($ospf_instance_update) { - $query = "UPDATE `ospf_instances` SET `ospf_instance_id` = '".$ospf_instance_db['ospf_instance_id']."'".$ospf_instance_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_instance_id` = '".$ospf_instance_id."'"; - if ($debug) { echo($query); } - mysql_query($query); - if ($debug) { echo(mysql_error()); } + dbUpdate($ospf_instance_update, 'ospf_instances', '`device_id` = ? AND `ospf_instance_id` = ?', array($device['device_id'], $ospf_instance_id)); echo("U"); unset($ospf_instance_update); } else { @@ -85,8 +78,7 @@ echo(" Areas: "); $ospf_area_oids = array('ospfAuthType','ospfImportAsExtern','ospfSpfRuns','ospfAreaBdrRtrCount','ospfAsBdrRtrCount','ospfAreaLsaCount','ospfAreaLsaCksumSum','ospfAreaSummary','ospfAreaStatus'); ### Build array of existing entries -$query = mysql_query("SELECT * FROM `ospf_areas` WHERE `device_id` = '".$device['device_id']."'"); -while ($entry = mysql_fetch_assoc($query)) +foreach (dbFetchRows("SELECT * FROM `ospf_areas` WHERE `device_id` = ?", array($device['device_id'])) as $entry) { $ospf_areas_db[$entry['ospfAreaId']] = $entry; } @@ -99,9 +91,9 @@ foreach ($ospf_areas_poll as $ospf_area_id => $ospf_area) ### If the entry doesn't already exist in the prebuilt array, insert into the database and put into the array if (!isset($ospf_areas_db[$ospf_area_id])) { - mysql_query("INSERT INTO `ospf_areas` (`device_id`, `ospfAreaId`) VALUES ('".$device['device_id']."','".$ospf_area_id."') "); + dbInsert(array('device_id' => $device['device_id'], 'ospfAreaId' => $ospf_area_id), 'ospf_areas'); echo("+"); - $entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_areas` WHERE `device_id` = '".$device['device_id']."' AND `ospfAreaId` = '".$ospf_area_id."'")); + $entry = dbFetchRows("SELECT * FROM `ospf_areas` WHERE `device_id` = ? AND `ospfAreaId` = ?",array($device['device_id'], $ospf_area_id)); $ospf_areas_db[$entry['ospf_area_id']] = $entry; } } @@ -121,28 +113,31 @@ if (is_array($ospf_areas_db)) { foreach ($ospf_areas_db as $ospf_area_db) { - $ospf_area_poll = $ospf_areas_poll[$ospf_area_db['ospfAreaId']]; - foreach ($ospf_area_oids as $oid) - { ## Loop the OIDs - if ($ospf_area_db[$oid] != $ospf_area_poll[$oid]) - { ## If data has changed, build a query - $ospf_area_update .= ", `$oid` = '".mres($ospf_area_poll[$oid])."'"; - #log_event("$oid -> ".$this_port[$oid], $device, 'interface', $port['interface_id']); ## FIXME - } - } - if ($ospf_area_update) + if (is_array($ospf_ports_poll[$ospf_port_db['ospf_port_id']])) { - $sql = "UPDATE `ospf_areas` SET `ospfAreaId` = '".$ospf_area_db['ospfAreaId']."'".$ospf_area_update." WHERE `device_id` = '".$device['device_id']."' AND `ospfAreaId` = '".$ospf_area_id."'"; - mysql_query($sql); - if ($debug) { echo("$sql\n"); } - echo("U"); - unset($ospf_area_update); + $ospf_area_poll = $ospf_areas_poll[$ospf_area_db['ospfAreaId']]; + foreach ($ospf_area_oids as $oid) + { ## Loop the OIDs + if ($ospf_area_db[$oid] != $ospf_area_poll[$oid]) + { ## If data has changed, build a query + $ospf_area_update[$oid] = $ospf_area_poll[$oid]; + #log_event("$oid -> ".$this_port[$oid], $device, 'interface', $port['interface_id']); ## FIXME + } + } + if ($ospf_area_update) + { + dbUpdate($ospf_area_update, 'ospf_areas', '`device_id` = ? AND `ospfAreaId` = ?', array($device['device_id'], $ospf_area_id)); + echo("U"); + unset($ospf_area_update); + } else { + echo("."); + } + unset($ospf_area_poll); + unset($ospf_area_db); + $ospf_area_count++; } else { - echo("."); + dbDelete('ospf_ports', '`device_id` = ? AND `ospfAreaId` = ?', array($device['device_id'], $ospf_area_db['ospfAreaId'])); } - unset($ospf_area_poll); - unset($ospf_area_db); - $ospf_area_count++; } } @@ -158,8 +153,7 @@ echo(" Ports: "); $ospf_port_oids = array('ospfIfIpAddress','interface_id','ospfAddressLessIf','ospfIfAreaId','ospfIfType','ospfIfAdminStat','ospfIfRtrPriority','ospfIfTransitDelay','ospfIfRetransInterval','ospfIfHelloInterval','ospfIfRtrDeadInterval','ospfIfPollInterval','ospfIfState','ospfIfDesignatedRouter','ospfIfBackupDesignatedRouter','ospfIfEvents','ospfIfAuthKey','ospfIfStatus','ospfIfMulticastForwarding','ospfIfDemand','ospfIfAuthType'); ### Build array of existing entries -$query = mysql_query("SELECT * FROM `ospf_ports` WHERE `device_id` = '".$device['device_id']."'"); -while ($entry = mysql_fetch_assoc($query)) +foreach (dbFetchRows("SELECT * FROM `ospf_ports` WHERE `device_id` = ?", array($device['device_id'])) as $entry) { $ospf_ports_db[$entry['ospf_port_id']] = $entry; } @@ -172,10 +166,9 @@ foreach ($ospf_ports_poll as $ospf_port_id => $ospf_port) ### If the entry doesn't already exist in the prebuilt array, insert into the database and put into the array if (!isset($ospf_ports_db[$ospf_port_id])) { - mysql_query("INSERT INTO `ospf_ports` (`device_id`, `ospf_port_id`) VALUES ('".$device['device_id']."','".$ospf_port_id."') "); + dbInsert(array('device_id' => $device['device_id'], 'ospf_port_id' => $ospf_port_id), 'ospf_ports'); echo("+"); - $entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_ports` WHERE `device_id` = '".$device['device_id']."' AND `ospf_port_id` = '".$ospf_port_id."'")); - $ospf_ports_db[$entry['ospf_port_id']] = $entry; + $ospf_ports_db[$entry['ospf_port_id']] = dbFetchRow("SELECT * FROM `ospf_ports` WHERE `device_id` = ? AND `ospf_port_id` = ?", array($device['device_id'], $ospf_port_id)); } } @@ -199,24 +192,22 @@ if (is_array($ospf_ports_db)) if ($ospf_port_poll['ospfAddressLessIf']) { - $ospf_port_poll['interface_id'] = @mysql_result(mysql_query("SELECT `interface_id` FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '".$ospf_port_poll['ospfAddressLessIf']."'"),0); + $ospf_port_poll['interface_id'] = @dbFetchCell("SELECT `interface_id` FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?", array($device['device_id'], $ospf_port_poll['ospfAddressLessIf'])); } else { - $ospf_port_poll['interface_id'] = @mysql_result(mysql_query("SELECT A.`interface_id` FROM ipv4_addresses AS A, ports AS I WHERE A.ipv4_address = '".$ospf_port_poll['ospfIfIpAddress']."' AND I.interface_id = A.interface_id AND I.device_id = '".$device['device_id']."'"),0); + $ospf_port_poll['interface_id'] = @dbFetchCell("SELECT A.`interface_id` FROM ipv4_addresses AS A, ports AS I WHERE A.ipv4_address = ? AND I.interface_id = A.interface_id AND I.device_id = ?", array($ospf_port_poll['ospfIfIpAddress'], $device['device_id'])); } foreach ($ospf_port_oids as $oid) { // Loop the OIDs if ($ospf_port_db[$oid] != $ospf_port_poll[$oid]) { // If data has changed, build a query - $ospf_port_update .= ", `$oid` = '".mres($ospf_port_poll[$oid])."'"; + $ospf_port_update[$oid] = $ospf_port_poll[$oid]; #log_event("$oid -> ".$this_port[$oid], $device, 'ospf', $port['interface_id']); ## FIXME } } if ($ospf_port_update) { - $query = "UPDATE `ospf_ports` SET `ospf_port_id` = '".$ospf_port_db['ospf_port_id']."'".$ospf_port_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_port_id` = '".$ospf_port_id."'"; - mysql_query($query); - if ($debug) { echo("$query"); } + dbUpdate($ospf_port_update, 'ospf_ports', '`device_id` = ? AND `ospf_port_id` = ?', array($device['device_id'], $ospf_port_id)); echo("U"); unset($ospf_port_update); } else { @@ -226,7 +217,8 @@ if (is_array($ospf_ports_db)) unset($ospf_port_db); $ospf_port_count++; } else { - mysql_query("DELETE FROM `ospf_ports` WHERE `device_id` = '".$device['device_id']."' AND `ospf_port_id` = '".$ospf_port_db['ospf_port_id']."'"); + dbDelete('ospf_ports', '`device_id` = ? AND `ospf_port_id` = ?', array($device['device_id'], $ospf_port_db['ospf_port_id'])); + # "DELETE FROM `ospf_ports` WHERE `device_id` = '".$device['device_id']."' AND `ospf_port_id` = '".$ospf_port_db['ospf_port_id']."'"); echo("-"); } } @@ -251,8 +243,7 @@ $ospf_nbr_oids_rrd = array(); $ospf_nbr_oids = array_merge($ospf_nbr_oids_db, $ospf_nbr_oids_rrd); ### Build array of existing entries -$nbr_query = mysql_query("SELECT * FROM `ospf_nbrs` WHERE `device_id` = '".$device['device_id']."'"); -while ($nbr_entry = mysql_fetch_assoc($nbr_query)) +foreach (dbFetchRows("SELECT * FROM `ospf_nbrs` WHERE `device_id` = ?", array($device['device_id'])) as $nbr_entry) { $ospf_nbrs_db[$nbr_entry['ospf_nbr_id']] = $nbr_entry; } @@ -265,9 +256,9 @@ foreach ($ospf_nbrs_poll as $ospf_nbr_id => $ospf_nbr) ### If the entry doesn't already exist in the prebuilt array, insert into the database and put into the array if (!isset($ospf_nbrs_db[$ospf_nbr_id])) { - mysql_query("INSERT INTO `ospf_nbrs` (`device_id`, `ospf_nbr_id`) VALUES ('".$device['device_id']."','".$ospf_nbr_id."') "); + dbInsert(array('device_id' => $device['device_id'], 'ospf_nbr_id' => $ospf_nbr_id), 'ospf_nbrs'); echo("+"); - $entry = mysql_fetch_assoc(mysql_query("SELECT * FROM `ospf_nbrs` WHERE `device_id` = '".$device['device_id']."' AND `ospf_nbr_id` = '".$ospf_nbr_id."'")); + $entry = dbFetchRow("SELECT * FROM `ospf_nbrs` WHERE `device_id` = ? AND `ospf_nbr_id` = ?", array($device['device_id'], $ospf_nbr_id)); $ospf_nbrs_db[$entry['ospf_nbr_id']] = $entry; } } @@ -290,7 +281,7 @@ if (is_array($ospf_nbrs_db)) { $ospf_nbr_poll = $ospf_nbrs_poll[$ospf_nbr_db['ospf_nbr_id']]; - $ospf_nbr_poll['interface_id'] = @mysql_result(mysql_query("SELECT A.`interface_id` FROM ipv4_addresses AS A, nbrs AS I WHERE A.ipv4_address = '".$ospf_nbr_poll['ospfNbrIpAddr']."' AND I.interface_id = A.interface_id AND I.device_id = '".$device['device_id']."'"),0); + $ospf_nbr_poll['interface_id'] = @dbFetchCell("SELECT A.`interface_id` FROM ipv4_addresses AS A, nbrs AS I WHERE A.ipv4_address = ? AND I.interface_id = A.interface_id AND I.device_id = ?", array($ospf_nbr_poll['ospfNbrIpAddr'], $device['device_id'])); if ($ospf_nbr_db['interface_id'] != $ospf_nbr_poll['interface_id']) { @@ -302,15 +293,13 @@ if (is_array($ospf_nbrs_db)) if ($debug) { echo($ospf_nbr_db[$oid]."|".$ospf_nbr_poll[$oid]."\n"); } if ($ospf_nbr_db[$oid] != $ospf_nbr_poll[$oid]) { // If data has changed, build a query - $ospf_nbr_update .= ", `$oid` = '".mres($ospf_nbr_poll[$oid])."'"; + $ospf_nbr_update[$oid] = $ospf_nbr_poll[$oid]; #log_event("$oid -> ".$this_nbr[$oid], $device, 'ospf', $nbr['interface_id']); ## FIXME } } if ($ospf_nbr_update) { - $query = "UPDATE `ospf_nbrs` SET `interface_id` = '".$ospf_nbr_poll['interface_id']."'".$ospf_nbr_update." WHERE `device_id` = '".$device['device_id']."' AND `ospf_nbr_id` = '".$ospf_nbr_id."'"; - mysql_query($query); - if ($debug) { echo("$query"); } + dbUpdate($ospf_nbr_update, 'ospf_nbrs', '`device_id` = ? AND `ospf_nbr_id` = ?', array($device['device_id'], $ospf_nbr_id)); echo("U"); unset($ospf_nbr_update); } else { @@ -321,7 +310,7 @@ if (is_array($ospf_nbrs_db)) unset($ospf_nbr_db); $ospf_nbr_count++; } else { - mysql_query("DELETE FROM `ospf_nbrs` WHERE `device_id` = '".$device['device_id']."' AND `ospf_nbr_id` = '".$ospf_nbr_db['ospf_nbr_id']."'"); + dbDelete('ospf_nbrs', '`device_id` = ? AND `ospf_nbr_id` = ?', array($device['device_id'], $ospf_nbr_db['ospf_nbr_id'])); echo("-"); } } diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index ec3985ad2a..46c6036f75 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -5,8 +5,6 @@ #$ports = snmp_cache_ifIndex($device); // Cache Port List # /FIXME -#mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`) VALUES ('".$device['device_id']."','$ifIndex')"); - // Build SNMP Cache Array $data_oids = array('ifName','ifDescr','ifAlias', 'ifAdminStatus', 'ifOperStatus', 'ifMtu', 'ifSpeed', 'ifHighSpeed', 'ifType', 'ifPhysAddress', 'ifPromiscuousMode','ifConnectorPresent','ifDuplex'); @@ -45,7 +43,7 @@ if ($config['enable_ports_etherlike']) if ($config['enable_ports_adsl']) { - $device['adsl_count'] = mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifType` = 'adsl'"),0); + $device['adsl_count'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE `device_id` = ? AND `ifType` = 'adsl'", array($device['device_id'])); } if ($device['adsl_count'] > "0") @@ -111,7 +109,6 @@ foreach ($port_stats as $ifIndex => $port) { $interface_id = dbInsert(array('device_id' => $device['device_id'], 'ifIndex' => $ifIndex), 'ports'); $ports[$port['ifIndex']] = dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($interface_id)); - mysql_error(); echo("Adding: ".$port['ifName']."(".$ifIndex.")(".$ports[$port['ifIndex']]['interface_id'].")"); #print_r($ports); } elseif ($ports[$ifIndex]['deleted'] == "1") { @@ -314,13 +311,13 @@ foreach ($ports as $port) if($device['os'] == "aos") { include("port-alcatel.inc.php"); } - // Update MySQL + // Update Database if (count($port['update'])) { $updated = dbUpdate($port['update'], 'ports', '`interface_id` = ?', array($port['interface_id'])); if($debug) { echo("$updated updated"); } } - // End Update MySQL + // End Update Database // Send alerts for interface flaps. if ($config['warn']['ifdown'] && ($port['ifOperStatus'] != $this_port['ifOperStatus']) && $port['ignore'] == 0)