Changeset 7201

Timestamp:

Oct 17, 2016, 12:29:18 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2031: Import function stops with blank page

Seems like the redirect URL to the new dialog was not generated correctly. Encoding is needed on all string parameters. Don't know why the production server is not affected. Maybe Apache is fixing things...

Location:

trunk/www/common

Files:

• export/index.jsp (modified) (1 diff)
• import/index.jsp (modified) (3 diffs)

trunk/www/common/export/index.jsp

@@ -81 +81 @@
       "&cmd=SelectPlugin&main_type=EXPORT"+
       "&item_type="+itemType.name()+
-      "&subcontext="+subContext+
+      "&subcontext="+HTML.urlEncode(subContext)+
       "&context_type="+contextType.name()+
       "&title="+HTML.urlEncode(request.getParameter("title"));

trunk/www/common/import/index.jsp

@@ -157 +157 @@
         "&cmd=NewJob&pluginconfiguration_id="+pluginConfigurationId+
         "&plugindefinition_id="+pluginDefinitionId+
-        "&title="+request.getParameter("title")+
+        "&title="+HTML.urlEncode(request.getParameter("title"))+
         "&job_name="+HTML.urlEncode(request.getParameter("job_name"))+
         "&job_description="+HTML.urlEncode(request.getParameter("job_description"))+
         "&item_type="+context.getItem().name()+
-        "&subcontext="+subContext+
+        "&subcontext="+HTML.urlEncode(subContext)+
         "&context_type="+context.getType().name()+
         "&warnIfOpen=0";
@@ -194 +194 @@
       forward = "no_fileformat.jsp?ID="+ID+
         "&file_id="+f.getId()+
-        "&title="+request.getParameter("title")+
+        "&title="+HTML.urlEncode(request.getParameter("title"))+
         "&job_name="+HTML.urlEncode(request.getParameter("job_name"))+
         "&job_description="+HTML.urlEncode(request.getParameter("job_description"))+
         "&item_type="+context.getItem().name()+
-        "&subcontext="+subContext+
+        "&subcontext="+HTML.urlEncode(subContext)+
         "&context_type="+context.getType().name();
       //throw new WebException("popup", "Import failed", "Couldn't find any file format matching file {1}", f);
@@ -225 +225 @@
             (pc == null ? "" : "&pluginconfiguration_id="+ pc.getId()) +
             "&plugindefinition_id="+plugin.getId()+
-            "&title="+request.getParameter("title")+
+            "&title="+HTML.urlEncode(request.getParameter("title"))+
             "&job_name="+HTML.urlEncode(request.getParameter("job_name"))+
             "&job_description="+HTML.urlEncode(request.getParameter("job_description"))+
             "&item_type="+context.getItem().name()+
-            "&subcontext="+subContext+
+            "&subcontext="+HTML.urlEncode(subContext)+
             "&context_type="+context.getType().name()+
             "&parameter:" + Parameters.CHARSET_PARAMETER + "=" + HTML.urlEncode(charset) +