From d7f24c6a5a9c7c279e4fb08c4781f9823ca6db23 Mon Sep 17 00:00:00 2001
From: Ahmed Sajid <ahmed4343@hotmail.com>
Date: Thu, 28 Jul 2016 16:21:33 -0400
Subject: [PATCH] Remove unwanted characters from poll info

Similar to PR 3883.

Removing carriage return character \r, causing the following error while trying view minigraphs on device list page:

SyntaxError: unterminated string literal

return overlib('<div style=\'background-color: #FFFFFF;\'><div><span class=
This issue has been experienced with S4810 devices.
---
 includes/polling/os/dnos.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/polling/os/dnos.inc.php b/includes/polling/os/dnos.inc.php
index 9b3f1a1d57..59d13dc210 100644
--- a/includes/polling/os/dnos.inc.php
+++ b/includes/polling/os/dnos.inc.php
@@ -17,7 +17,8 @@ if (preg_match('/Dell Networking N[1234].*/' , $temp_hardware) == 1) {  // If De
     $features = snmp_get($device, 'productIdentificationDescription.0', '-Ovq', 'Dell-Vendor-MIB');
 }
 else {  // Assume S-series
-    list(,,$version,$hardware,,) = explode(PHP_EOL, $poll_device['sysDescr']);
+    $sysDescr =  preg_replace('/[\r]+/',' ', $poll_device['sysDescr']);
+    list(,,$version,$hardware,,) = explode(PHP_EOL, $sysDescr);
     list(,$version) = explode(': ',$version);
     list(,$hardware) = explode(': ',$hardware);
 }