[mapguide-commits] r5449 - in trunk/MgDev: Oem/LinuxApt Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2010-12-08 02:15:59 -0800 (Wed, 08 Dec 2010)
New Revision: 5449

Modified:
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
   trunk/MgDev/Web/src/mapviewernet/quickplotgeneratepicture.aspx
   trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
   trunk/MgDev/Web/src/mapviewerphp/quickplotpreviewinner.php
Log:
Fix ticket: https://trac.osgeo.org/mapguide/ticket/1558


Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2010-12-08 10:11:54 UTC (rev 5448)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2010-12-08 10:15:59 UTC (rev 5449)
@@ -200,7 +200,7 @@
 pushd ../php
 ./configure --prefix=$INSTALLWEB/php --with-apxs2=$INSTALLWEB/apache2/bin/apxs --with-openssl \
 --with-curl --enable-xml --enable-wddx --enable-shared  \
---enable-safe-mode --with-zlib --enable-mbstring=all --with-xsl=/usr/lib
+--enable-safe-mode --with-zlib --enable-mbstring=all --with-xsl=/usr/lib --with-gd --with-png --with-jpeg --with-freetype
 check_php_build
 make
 check_php_build

Modified: trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp	2010-12-08 10:11:54 UTC (rev 5448)
+++ trunk/MgDev/Web/src/mapviewerjava/quickplotgeneratepicture.jsp	2010-12-08 10:15:59 UTC (rev 5449)
@@ -117,9 +117,10 @@
     // Get the map agent url
     // Get the correct http protocol
     StringBuilder mapAgent = new StringBuilder(mapAgentPath);
+    String encodeMapName = URLEncoder.encode(mapName,"UTF-8");
     mapAgent.append("?VERSION=1.0.0&OPERATION=GETMAPIMAGE")
             .append("&SESSION=").append(sessionId)
-            .append("&MAPNAME=").append(mapName)
+            .append("&MAPNAME=").append(encodeMapName)
             .append("&FORMAT=PNG")
             .append("&SETVIEWCENTERX=").append(center.GetX())
             .append("&SETVIEWCENTERY=").append(center.GetY())

Modified: trunk/MgDev/Web/src/mapviewernet/quickplotgeneratepicture.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/quickplotgeneratepicture.aspx	2010-12-08 10:11:54 UTC (rev 5448)
+++ trunk/MgDev/Web/src/mapviewernet/quickplotgeneratepicture.aspx	2010-12-08 10:15:59 UTC (rev 5449)
@@ -127,7 +127,7 @@
 
     mapAgent.Append("/mapagent/mapagent.fcgi?VERSION=1.0.0&OPERATION=GETMAPIMAGE")
             .AppendFormat("&SESSION={0}", sessionID)
-            .AppendFormat("&MAPNAME={0}", mapName)
+            .AppendFormat("&MAPNAME={0}", HttpUtility.UrlEncode(mapName))
             .Append("&FORMAT=PNG")
             .AppendFormat("&SETVIEWCENTERX={0}", center.GetX())
             .AppendFormat("&SETVIEWCENTERY={0}", center.GetY())

Modified: trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php	2010-12-08 10:11:54 UTC (rev 5448)
+++ trunk/MgDev/Web/src/mapviewerphp/quickplotgeneratepicture.php	2010-12-08 10:15:59 UTC (rev 5449)
@@ -104,7 +104,7 @@
         $mapAgent .= substr($_SERVER["REQUEST_URI"], 0, strpos($_SERVER["REQUEST_URI"], "/", 1));
         $mapAgent .="/mapagent/mapagent.fcgi?VERSION=1.0.0&OPERATION=GETMAPIMAGE" .
                     "&SESSION=$sessionID" .
-                    "&MAPNAME=$mapName" .
+                    "&MAPNAME=" . rawurlencode($mapName) .
                     "&FORMAT=PNG" .
                     "&SETVIEWCENTERX=" . $center->GetX() .
                     "&SETVIEWCENTERY=" . $center->GetY() .

Modified: trunk/MgDev/Web/src/mapviewerphp/quickplotpreviewinner.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/quickplotpreviewinner.php	2010-12-08 10:11:54 UTC (rev 5448)
+++ trunk/MgDev/Web/src/mapviewerphp/quickplotpreviewinner.php	2010-12-08 10:15:59 UTC (rev 5449)
@@ -25,7 +25,7 @@
     $args = GetRequestMethod();
     GetParameters($args);
 
-    $templ = file_get_contents("../viewerfiles/QuickPlotPreviewInner.templ");
+    $templ = file_get_contents("../viewerfiles/quickplotpreviewinner.templ");
     SetLocalizedFilesPath(GetLocalizationPath());
 
     // Localize the page