[Mapbender-commits] r6691 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-08-05 08:56:04 +0000 (Thu, 05 Aug 2010)
New Revision: 6691

Modified:
   trunk/mapbender/http/javascripts/initWmcObj.php
Log:
take WMS params from session if available

Modified: trunk/mapbender/http/javascripts/initWmcObj.php
===================================================================
--- trunk/mapbender/http/javascripts/initWmcObj.php	2010-08-05 08:55:35 UTC (rev 6690)
+++ trunk/mapbender/http/javascripts/initWmcObj.php	2010-08-05 08:56:04 UTC (rev 6691)
@@ -7,11 +7,26 @@
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 
 $wmc = new wmc();
-$wmc->createFromApplication(Mapbender::session()->get("mb_user_gui"));
 
-//validate GET params from Mapbender Url
-$getParams = $_GET;
+//check if session contains a wmc, otherwise create a new wmc from application
+if (!Mapbender::session()->get("mb_wmc")) {
+	$e = new mb_notice("wmc not set, generating from app: " . Mapbender::session()->get("mb_user_gui"));
+	$wmc->createFromApplication(Mapbender::session()->get("mb_user_gui"));
+}
+else {
+	if (!$wmc->createFromXml(Mapbender::session()->get("mb_wmc"))) {
+		$e = new mb_notice("error creating initial WMC from session.");
+	}
+}
 
+//check if WMS param can be found in SESSION, otherwise take it from GET
+if (Mapbender::session()->exists("WMS")) {
+	$getParams['WMS'] = Mapbender::session()->get("WMS");
+}
+else {
+	$getParams['WMS'] = $_GET['WMS'];
+}
+
 if ($getParams['WMS']) {
 	// WMS param given as array
 	if (is_array($getParams['WMS'])) {
@@ -88,6 +103,7 @@
 for ($i = 0; $i < count($output); $i++) {
 	echo administration::convertOutgoingString($output[$i]);
 }
+
 unset($output);
 unset($wmc);
 ?>