[Mapbender-commits] r4849 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-10-22 04:52:43 -0400 (Thu, 22 Oct 2009)
New Revision: 4849

Modified:
   trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php
   trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
   trunk/mapbender/http/php/mod_createJSObjFromXML.php
Log:
parent bug

Modified: trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php	2009-10-22 08:28:37 UTC (rev 4848)
+++ trunk/mapbender/http/php/mod_createJSLayerObjFromXML.php	2009-10-22 08:52:43 UTC (rev 4849)
@@ -44,7 +44,12 @@
 		"}";
 }
 else {
-	$output .= $mywms->createJsLayerObjFromWMS("TRUE", $layerName);
+	if ($noHtml) {
+		$output .= $mywms->createJsLayerObjFromWMS(false, $layerName);
+	}
+	else {
+		$output .= $mywms->createJsLayerObjFromWMS(true, $layerName);
+	}
 }
 
 $js = administration::convertOutgoingString($output);

Modified: trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php	2009-10-22 08:28:37 UTC (rev 4848)
+++ trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php	2009-10-22 08:52:43 UTC (rev 4849)
@@ -37,7 +37,12 @@
 	else{
 		$mywms->createObjFromDBNoGui($wms_id);	
 	}
-	$output = $mywms->createJsObjFromWMS_(true);
+	if ($noHtml) {
+		$output .= $mywms->createJsObjFromWMS_(false);
+	}
+	else {
+		$output .= $mywms->createJsObjFromWMS_(true);
+	}
 	$js .= administration::convertOutgoingString($output);
 	unset($output);
 }

Modified: trunk/mapbender/http/php/mod_createJSObjFromXML.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromXML.php	2009-10-22 08:28:37 UTC (rev 4848)
+++ trunk/mapbender/http/php/mod_createJSObjFromXML.php	2009-10-22 08:52:43 UTC (rev 4849)
@@ -43,7 +43,12 @@
 		"}";
 }
 else {
-	$output .= $mywms->createJsObjFromWMS_(true);
+	if ($noHtml) {
+		$output .= $mywms->createJsObjFromWMS_(false);
+	}
+	else {
+		$output .= $mywms->createJsObjFromWMS_(true);
+	}
 }
 $js = administration::convertOutgoingString($output);
 unset($output);