diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php
index f426c4f0b0..57e49a14ca 100644
--- a/html/pages/device/edit/device.inc.php
+++ b/html/pages/device/edit/device.inc.php
@@ -24,17 +24,16 @@ if ($_POST['editing'])
     if (isset($override_sysLocation_string)) { set_dev_attrib($device, 'override_sysLocation_string', $override_sysLocation_string); };
 
     #FIXME needs more sanity checking! and better feedback
-    $sql = "UPDATE `devices` SET `purpose` = '" . $descr . "', `type` = '$type'";
-    $sql .= ", `ignore` = '$ignore',  `disabled` = '$disabled'";
-    $sql .= " WHERE `device_id` = '".$device['device_id']."'";
-    $query = mysql_query($sql);
 
-    $rows_updated = mysql_affected_rows();
+    $param = array('purpose' => $_POST['descr'], 'type' => $_POST['type'], 'ignore' => $_POST['ignore'], 'disabled' => $_POST['disabled']);
+
+    $rows_updated = dbUpdate($param, 'devices', '`device_id` = ?', array($device['device_id']));
 
     if ($rows_updated > 0 || $updated)
     {
       $update_message = "Device record updated.";
       $updated = 1;
+      $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = ?", array($device['device_id']));
     } elseif ($rows_updated = '-1') {
       $update_message = "Device record unchanged. No update necessary.";
       $updated = -1;
diff --git a/html/pages/device/edit/ports.inc.php b/html/pages/device/edit/ports.inc.php
index ef113b3b2d..6aa07a7518 100644
--- a/html/pages/device/edit/ports.inc.php
+++ b/html/pages/device/edit/ports.inc.php
@@ -105,8 +105,7 @@ $(document).ready(function(){
 
 $row=1;
 
-$query = mysql_query("SELECT * FROM `ports` WHERE device_id='".$device['device_id']."' ORDER BY `ifIndex` ");
-while ($port = mysql_fetch_assoc($query))
+foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? ORDER BY `ifIndex` ", array($device['device_id'])) as $port)
 {
   $port = ifLabel($port);
 
@@ -145,4 +144,4 @@ echo('</table>');
 echo('</form>');
 echo('</div>');
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/edit/services.inc.php b/html/pages/device/edit/services.inc.php
index be2957dd72..a49ee27f19 100644
--- a/html/pages/device/edit/services.inc.php
+++ b/html/pages/device/edit/services.inc.php
@@ -27,19 +27,18 @@ if ($handle = opendir($config['install_dir'] . "/includes/services/"))
   closedir($handle);
 }
 
-$query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`");
-while ($device = mysql_fetch_assoc($query))
+foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $dev);
 {
-  $devicesform .= "<option value='" . $device['device_id'] . "'>" . $device['hostname'] . "</option>";
+  $devicesform .= "<option value='" . $dev['device_id'] . "'>" . $dev['hostname'] . "</option>";
 }
 
 if ($updated) { print_message("Device Settings Saved"); }
 
-if (mysql_result(mysql_query("SELECT COUNT(*) from `services` WHERE `device_id` = '".$device['device_id']."'"), 0) > '0')
+if (dbFetchCell("SELECT COUNT(*) from `services` WHERE `device_id` = ?" array($device['device_id'])) > '0')
 {
   $i = "1";
   $service_query = mysql_query("select * from services WHERE device_id = '".$device['device_id']."' ORDER BY service_type");
-  while ($service = mysql_fetch_assoc($service_query))
+  foreach (dbFetchRows("select * from services WHERE device_id = ? ORDER BY service_type", array($device['device_id'])) as $service)
   {
     $existform .= "<option value='" . $service['service_id'] . "'>" . $service['service_type'] . "</option>";
   }
@@ -100,4 +99,4 @@ echo("
 </form>
 </div>");
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php
index 51a5294147..13a34f0f9f 100644
--- a/html/pages/device/edit/snmp.inc.php
+++ b/html/pages/device/edit/snmp.inc.php
@@ -11,13 +11,11 @@ if ($_POST['editing'])
     $retries = mres($_POST['retries']);
 
     #FIXME needs more sanity checking! and better feedback
-    $sql = "UPDATE `devices` SET `community` = '" . $community . "', `snmpver` = '" . $snmpver . "', `port` = '$port', ";
-    if ($timeout) { $sql .= "`timeout` = '$timeout', "; } else { $sql .= "`timeout` = NULL, "; }
-    if ($retries) { $sql .= "`retries` = '$retries'"; } else { $sql .= "`retries` = NULL"; }
-    $sql .= " WHERE `device_id` = '".$device['device_id']."'";
-    $query = mysql_query($sql);
-
-    $rows_updated = mysql_affected_rows();
+    $update = array('community' => $_POST['community'], 'snmpver' => $_POST['snmpver'], 'port' => $_POST['port']);
+    if ($_POST['timeout']) { $update['timeout'] = $_POST['timeout']; } else { $update['timeout'] = array(NULL); }
+    if ($_POST['retries'])  { $update['retries'] = $_POST['retries']; } else { $update['retries'] = array(NULL); }
+ 
+    $rows_updated = dbUpdate($update, 'devices', '`device_id` = ?',array($device['device_id']));
 
     if ($rows_updated > 0)
     {
@@ -33,7 +31,7 @@ if ($_POST['editing'])
   }
 }
 
-$device = mysql_fetch_assoc(mysql_query("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'"));
+$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = ?", array($device['device_id']));
 $descr  = $device['purpose'];
 
 if ($updated && $update_message)
@@ -103,4 +101,4 @@ echo('
 </td>
 <td width="50"></td><td></td></tr></table>');
 
-?>
\ No newline at end of file
+?>