[mapguide-commits] r5330 - in trunk/MgDev/Web/src: mapviewerjava
mapviewernet mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Oct 26 05:13:06 EDT 2010
Author: hubu
Date: 2010-10-26 02:13:06 -0700 (Tue, 26 Oct 2010)
New Revision: 5330
Modified:
trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
trunk/MgDev/Web/src/mapviewerphp/mainframe.php
Log:
Fix ticket https://trac.osgeo.org/mapguide/ticket/1502
When the homepage of taskpane is empty, we should use the gettingstarted.jsp/aspx/php file as the default homepage of taskpane.
Modified: trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp 2010-10-26 08:57:42 UTC (rev 5329)
+++ trunk/MgDev/Web/src/mapviewerjava/mainframe.jsp 2010-10-26 09:13:06 UTC (rev 5330)
@@ -471,8 +471,8 @@
frameset = Substitute(frameSetTempl, vals);
}
- String homePageUrl = taskPaneUrl;
- if(homePageUrl.substring(0, 7).compareToIgnoreCase("http://") != 0)
+ String homePageUrl = URLDecoder.decode(taskPaneUrl,"UTF-8");
+ if(homePageUrl.length() < 8 || homePageUrl.substring(0, 7).compareToIgnoreCase("http://") != 0)
homePageUrl = vpath + homePageUrl;
//load the HTML template and format it
Modified: trunk/MgDev/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mainframe.aspx 2010-10-26 08:57:42 UTC (rev 5329)
+++ trunk/MgDev/Web/src/mapviewernet/mainframe.aspx 2010-10-26 09:13:06 UTC (rev 5330)
@@ -474,7 +474,7 @@
frameset = Substitute(frameset, vals);
}
- String homePageUrl = taskPane.GetInitialTaskUrl();
+ String homePageUrl = HttpUtility.UrlDecode(taskPaneUrl);
if (homePageUrl.Length < 8 || String.Compare(homePageUrl.Substring(0, 7), "http://", true) != 0)
homePageUrl = vpath + homePageUrl;
Modified: trunk/MgDev/Web/src/mapviewerphp/mainframe.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mainframe.php 2010-10-26 08:57:42 UTC (rev 5329)
+++ trunk/MgDev/Web/src/mapviewerphp/mainframe.php 2010-10-26 09:13:06 UTC (rev 5330)
@@ -470,8 +470,8 @@
$srcStatusbar);
}
- $homePageUrl = $taskPaneUrl;
- if(strncasecmp($homePageUrl, "http://", 7) != 0)
+ $homePageUrl = urldecode($taskPaneUrl);
+ if(strlen($homePageUrl) < 8 || strncasecmp($homePageUrl, "http://", 7) != 0)
$homePageUrl = $vpath . $homePageUrl;
//load the HTML template and format it
More information about the mapguide-commits
mailing list