[Mapbender-commits] r7925 - in trunk/mapbender/http: classes php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-07-08 02:50:53 -0700 (Fri, 08 Jul 2011)
New Revision: 7925

Modified:
   trunk/mapbender/http/classes/class_wmc.php
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
Some Bugfix and possibility to load wmc directly from ist metadata form.

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2011-07-08 07:59:35 UTC (rev 7924)
+++ trunk/mapbender/http/classes/class_wmc.php	2011-07-08 09:50:53 UTC (rev 7925)
@@ -675,7 +675,7 @@
 				if($row = db_fetch_row($res)) {
 					$sql = "UPDATE mb_user_wmc SET wmc = $1, wmc_timestamp = $2, abstract = $3, srs = $4, minx = $5, miny = $6,".
 						" maxx = $7, maxy = $8, wmc_title = $9 WHERE fkey_user_id = $10 AND wmc_serial_id=$11 AND wmc_timestamp = $12;";
-					$v = array($this->xml, time(), $this->wmc_abstract, $this->wmc_srs, $this->wmc_extent->minx, $this->wmc_extent->minx,
+					$v = array($this->xml, time(), $this->wmc_abstract, $this->wmc_srs, $this->wmc_extent->minx, $this->wmc_extent->miny,
 						$this->wmc_extent->maxx, $this->wmc_extent->maxy ,administration::convertOutgoingString($this->wmc_title), $this->userId, $this->wmc_id,$row[2]);
 					$t = array("s", "s","s","s","i","i","i","i", "s", "i", "i","s");
 					$res = db_prep_query($sql, $v, $t);

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2011-07-08 07:59:35 UTC (rev 7924)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2011-07-08 09:50:53 UTC (rev 7925)
@@ -805,6 +805,15 @@
 	
 }
 
+if (WRAPPER_PATH != '' && $resource == 'wmc') {
+	$showMapUrl = $mapbenderBaseUrl.WRAPPER_PATH."?WMC=".$resourceMetadata['contentid'];
+	//$html .= $t_a.$translation['addLayerToMap'].$t_b."<a href='".$showMapUrl."' target='_blank'><img src='../img/osgeo_graphics/layer-wms-add.png'></a>".$t_c;
+	$html .= $t_a."<button onclick='window.open(\"".$showMapUrl."\", 
+  \"windowname1\", 
+  \"width=1024, height=768\");'
+   return false;><img src='../img/osgeo_graphics/layer-wms-add.png'>".$translation['showMap']."</button>".$t_b."".$t_c;
+	
+}
 
 $html .= $tableEnd;
 $html .= '</p>';