[Mapbender-commits] r5675 - in trunk/mapbender/http: extensions
javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Feb 25 09:28:23 EST 2010
Author: christoph
Date: 2010-02-25 09:28:23 -0500 (Thu, 25 Feb 2010)
New Revision: 5675
Modified:
trunk/mapbender/http/extensions/ext_featureInfoTunnel.php
trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
Log:
faulty encoding
Modified: trunk/mapbender/http/extensions/ext_featureInfoTunnel.php
===================================================================
--- trunk/mapbender/http/extensions/ext_featureInfoTunnel.php 2010-02-25 14:28:18 UTC (rev 5674)
+++ trunk/mapbender/http/extensions/ext_featureInfoTunnel.php 2010-02-25 14:28:23 UTC (rev 5675)
@@ -19,7 +19,13 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__) . "/../classes/class_stripRequest.php");
require_once(dirname(__FILE__) . "/../classes/class_connector.php");
-$mr = new stripRequest(urldecode($_REQUEST["url"]));
+if ($_GET["url"]) {
+ $mr = new stripRequest(urldecode($_GET["url"]));
+}
+else {
+ $mr = new stripRequest($_POST["url"]);
+}
+
$nmr = $mr->encodeGET();
$isOwsproxyRequest = (mb_strpos($nmr,OWSPROXY) === 0);
if($isOwsproxyRequest){
@@ -36,4 +42,4 @@
echo $x->file;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php 2010-02-25 14:28:18 UTC (rev 5674)
+++ trunk/mapbender/http/javascripts/mod_featureInfoTunnel.php 2010-02-25 14:28:23 UTC (rev 5675)
@@ -80,14 +80,14 @@
if(urls){
for(var i=0;i<urls.length;i++){
(function () {
- var currentRequest = escape(urls[i]);
+ var currentRequest = urls[i];
var cnt = i;
mb_ajax_post(path, {'url':currentRequest},function(js_code,status){
if(js_code){
if(featureInfoLayerPopup == 'true'){
var p = new mb_popup({
title:"Information",
- url:path+"?url="+currentRequest,
+ url:path+"?url="+encodeURIComponent(currentRequest),
width:parseInt(featureInfoPopupWidth, 10),
height:parseInt(featureInfoPopupHeight, 10),
top:200 + cnt*25,
@@ -96,7 +96,7 @@
p.show();
}
else{
- window.open(path+"?url="+currentRequest, "" , "width="+featureInfoPopupWidth+",height="+featureInfoPopupHeight+",scrollbars=yes,resizable=yes");
+ window.open(path+"?url="+encodeURIComponent(currentRequest), "" , "width="+featureInfoPopupWidth+",height="+featureInfoPopupHeight+",scrollbars=yes,resizable=yes");
}
}
else{
More information about the Mapbender_commits
mailing list