From 847c46df8bef180a83a10257ceb708a9187c8d88 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 4 Apr 2011 13:01:31 +0000
Subject: [PATCH] mres()ed or derezzed

git-svn-id: http://www.observium.org/svn/observer/trunk@2018 61d68cd4-352d-0410-923a-c4978735b2b8
---
 poller.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/poller.php b/poller.php
index 796b6bf57e..8c38bb9578 100755
--- a/poller.php
+++ b/poller.php
@@ -258,14 +258,14 @@ while ($device = mysql_fetch_assoc($device_query))
 
     if ($sysName && $sysName != $device['sysName'])
     {
-      $poll_update .= $poll_separator . "`sysName` = '$sysName'";
+      $poll_update .= $poll_separator . "`sysName` = '".mres($sysName)."'";
       $poll_separator = ", ";
       log_event("sysName -> $sysName", $device, 'system');
     }
 
     if ($sysDescr && $sysDescr != $device['sysDescr'])
     {
-      $poll_update .= $poll_separator . "`sysDescr` = '$sysDescr'";
+      $poll_update .= $poll_separator . "`sysDescr` = '".mres($sysDescr)."'";
       $poll_separator = ", ";
       log_event("sysDescr -> $sysDescr", $device, 'system');
     }
@@ -274,7 +274,7 @@ while ($device = mysql_fetch_assoc($device_query))
     {
       if (!get_dev_attrib($device,'override_sysLocation_bool'))
       {
-        $poll_update .= $poll_separator . "`location` = '$sysLocation'";
+        $poll_update .= $poll_separator . "`location` = '".mres($sysLocation)."'";
         $poll_separator = ", ";
       }
       log_event("Location -> $sysLocation", $device, 'system');
@@ -282,21 +282,21 @@ while ($device = mysql_fetch_assoc($device_query))
 
     if ($version && $device['version'] != $version)
     {
-      $poll_update .= $poll_separator . "`version` = '$version'";
+      $poll_update .= $poll_separator . "`version` = '".mres($version)."'";
       $poll_separator = ", ";
       log_event("OS Version -> $version", $device, 'system');
     }
 
     if ($features != $device['features'])
     {
-      $poll_update .= $poll_separator . "`features` = '$features'";
+      $poll_update .= $poll_separator . "`features` = '".mres($features)."'";
       $poll_separator = ", ";
       log_event("OS Features -> $features", $device, 'system');
     }
 
     if ($hardware && $hardware != $device['hardware'])
     {
-      $poll_update .= $poll_separator . "`hardware` = '$hardware'";
+      $poll_update .= $poll_separator . "`hardware` = '".mres($hardware)."'";
       $poll_separator = ", ";
       log_event("Hardware -> $hardware", $device, 'system');
     }