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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-07-19 04:46:41 -0700 (Tue, 19 Jul 2011)
New Revision: 7962

Modified:
   trunk/mapbender/http/php/mod_savewmc_server.php
Log:
Store epsg value into session, if wmc is stored into session.

Modified: trunk/mapbender/http/php/mod_savewmc_server.php
===================================================================
--- trunk/mapbender/http/php/mod_savewmc_server.php	2011-07-19 08:55:36 UTC (rev 7961)
+++ trunk/mapbender/http/php/mod_savewmc_server.php	2011-07-19 11:46:41 UTC (rev 7962)
@@ -61,32 +61,40 @@
 }
 
 if ($saveInSession === 1) {
-    // CLEAN SESSION WMC FILES 
-    //do this by cronjob!
-    //$tmp = scandir(TMPDIR);
-    // get all files from tmp folder
-    /*for($p = 0; $p < count($tmp); $p++) {
-        // match timestamp on begin of the filename
-        if(preg_match("/^([\d]+).*$/i", $tmp[$p],$timestamp)) {
-            // if file older than 24h, remove it.
-            if((time() - $timestamp[1]) >= 86400) { // 86400 = 24h
-                unlink(TMPDIR."/wmc/".$tmp[$p]);
-            }
-        }
-    }*/
-    
-	// store XML in tmp folder
-    if(Mapbender::session()->get("mb_wmc")) {
-        $filename = Mapbender::session()->get("mb_wmc");
-    } else {
-        $filename = TMPDIR."/wmc/".time()."_".uniqid();//will be set to new one cause ?
-    }
-    file_put_contents($filename, $wmc->xml);
-	Mapbender::session()->set("mb_wmc",$filename);
-    
+	// CLEAN SESSION WMC FILES 
+	//do this by cronjob!
+	//$tmp = scandir(TMPDIR);
+	// get all files from tmp folder
+	/*for($p = 0; $p < count($tmp); $p++) {
+	// match timestamp on begin of the filename
+       	if(preg_match("/^([\d]+).*$/i", $tmp[$p],$timestamp)) {
+            	// if file older than 24h, remove it.
+            	if((time() - $timestamp[1]) >= 86400) { // 86400 = 24h
+             	   unlink(TMPDIR."/wmc/".$tmp[$p]);
+           	 }
+        	}
+    	}*/ 
+    	// store XML in tmp folder
+    	if(Mapbender::session()->get("mb_wmc")) {
+        	$filename = Mapbender::session()->get("mb_wmc");
+    	} else {
+        	$filename = TMPDIR."/wmc/".time()."_".uniqid();//will be set to new one cause ?
+    	}
+    	file_put_contents($filename, $wmc->xml);
+    	Mapbender::session()->set("mb_wmc",$filename);
 	// store XML in session
-    //Mapbender::session()->set("mb_wmc",$wmc->xml);
-	Mapbender::session()->set("epsg",$mapObject->epsg);
+    	//Mapbender::session()->set("mb_wmc",$wmc->xml);
+	//$epsgTest=$wmc->mainMap->extent->toJavaScript();
+	$epsgString = $wmc->mainMap->extentToJavascript();
+	// get epsg code from jquery string
+	preg_match('/EPSG:\d{4,5}/',$epsgString, $matches);
+	$epsgString = $matches[0];
+	if (preg_match('/EPSG:\d{4,5}/',$epsgString, $matches)) {
+		$epsgString = $matches[0];
+		$e = new mb_notice("epsg: ".$epsgString);
+		$epsg = str_replace("EPSG:", "", $epsgString);
+		Mapbender::session()->set("epsg",$epsg);
+	}
 	Mapbender::session()->set("previous_gui", Mapbender::session()->get("mb_user_gui"));
 	
 	$e = new mb_notice("mod_insertWMCIntoDB: save WMC in session succeeded.");