[Mapbender-commits] r8327 - trunk/mapbender/lib

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2012-04-26 06:58:03 -0700 (Thu, 26 Apr 2012)
New Revision: 8327

Modified:
   trunk/mapbender/lib/class_Monitor.php
Log:
set correct encoding for local and remote xml

Modified: trunk/mapbender/lib/class_Monitor.php
===================================================================
--- trunk/mapbender/lib/class_Monitor.php	2012-04-26 13:54:55 UTC (rev 8326)
+++ trunk/mapbender/lib/class_Monitor.php	2012-04-26 13:58:03 UTC (rev 8327)
@@ -96,11 +96,11 @@
 				$capObject = new connector($this->capabilitiesURL);
 			}
 			//decode and encode to have the same behavior as loading caps to database
-			$this->remoteXML = $capObject->file;
+			$this->remoteXML = $admin->char_encode($capObject->file);
 
 			$this->timestamp_cap_end=microtime(TRUE);
 			//read local copy out of xml
-			$this->localXML = urldecode($this->getTagOutOfXML($this->reportFile,'getcapdoclocal'));
+			$this->localXML = $admin->char_encode(urldecode($this->getTagOutOfXML($this->reportFile,'getcapdoclocal')));
 //			$e=new mb_notice("Remote Caps: ".$this->remoteXML);
 			// service unreachable
 			if (!$this->remoteXML) {
@@ -137,8 +137,8 @@
 				else {
 					$this->result = 0;
 					$this->comment = "WMS is not up to date.";
-					$localXMLArray = explode("\n", htmlentities($this->localXML));
-					$remoteXMLArray = explode("\n", htmlentities($this->remoteXML));
+					$localXMLArray = explode("\n", $this->localXML);
+					$remoteXMLArray = explode("\n", $this->remoteXML);
 					$this->capabilitiesDiff = $this->outputDiffHtml($localXMLArray,$remoteXMLArray);
 					//$e=new mb_exception("Problem Docs are out of sync");
 				}