[mapguide-commits] r5354 - in branches/2.2/MgDev/Web/src: mapviewerjava mapviewernet mapviewerphp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2010-10-28 05:16:48 -0700 (Thu, 28 Oct 2010)
New Revision: 5354

Modified:
   branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp
   branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx
   branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php
Log:
Fix #1227: Write the decoded url to the mainframe template

Modified: branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp	2010-10-28 11:48:11 UTC (rev 5353)
+++ branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp	2010-10-28 12:16:48 UTC (rev 5354)
@@ -471,7 +471,7 @@
         frameset = Substitute(frameSetTempl, vals);
     }
 
-    String homePageUrl = taskPaneUrl;
+    String homePageUrl = URLDecoder.decode(taskPaneUrl,"UTF-8");
     if(homePageUrl.substring(0, 7).compareToIgnoreCase("http://") != 0)
         homePageUrl = vpath + homePageUrl;
 

Modified: branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx	2010-10-28 11:48:11 UTC (rev 5353)
+++ branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx	2010-10-28 12:16:48 UTC (rev 5354)
@@ -474,7 +474,7 @@
             frameset = Substitute(frameset, vals);
         }
 
-        String homePageUrl = taskPaneUrl;
+        String homePageUrl = HttpUtility.UrlDecode(taskPaneUrl);
         if (String.Compare(homePageUrl.Substring(0, 7), "http://", true) != 0)
             homePageUrl = vpath + homePageUrl;
 

Modified: branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php	2010-10-28 11:48:11 UTC (rev 5353)
+++ branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php	2010-10-28 12:16:48 UTC (rev 5354)
@@ -470,7 +470,7 @@
                                     $srcStatusbar);
         }
 
-        $homePageUrl = $taskPaneUrl;
+        $homePageUrl = urldecode($taskPaneUrl);
         if(strncasecmp($homePageUrl, "http://", 7) != 0)
             $homePageUrl = $vpath . $homePageUrl;