Changeset 31731

Timestamp:

2017-06-12T14:48:20+12:00 (6 years ago)

Author:

kjdon

Message:

dm_safing the decodedcompressedargs - which I think is always used inside a form - breaks the depositor if there is an underscore in hte filename. Does it make sense for there ever to be a macro in this anyway? would we ever be in a position to scan this for macros? I think not. So ai have make decodedcompressedoptions to be not dm_safed. However, just in case we did actually need it, I have made _decodedcompressedOptionsAttrDmSafe_ which *is* dm_safed, so this can be used by changing the macro file, not requiring code changes.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp

@@ -1105 +1105 @@
 
   text_t compressed_args;
+   
   if (compress_save_args (argsinfo, configinfo.saveconf, args, 
               compressed_args, *outconverter, logout))
-    return compressed_args;
+     return compressed_args;
 
   return g_EmptyText;
@@ -1483 +1484 @@
   // (e.g. %25 becomes %2525)
   decode_cgi_arg (compressedoptions); 
+
   if (args["w"] == "utf-8") { // if the encoding was utf-8, then compressed options was utf-8, and we need unicode.
     // if encoding wasn't utf-8, then compressed opotions may be screwed up, but seems to work for 8 bit encodings?
@@ -1488 +1490 @@
   }
 
-  text_t dmacrovalue = dm_safe(compressedoptions);
+  // does it need to be dm_safed? this breaks depositor when there is _ in filename
+  //text_t dmacrovalue = dm_safe(compressedoptions);
+  text_t dmacrovalue = compressedoptions;
+
   disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dmacrovalue); 
   disp.setmacro ("decodedcompressedoptionsAttrsafe", displayclass::defaultpackage, encodeForHTMLAttr(dmacrovalue));
+  // the old version was dm_safed, so make a dm safe version in case we need it
+  disp.setmacro ("decodedcompressedoptionsAttrDmsafe", displayclass::defaultpackage, encodeForHTMLAttr(dm_safe(dmacrovalue)));
 
 #if defined (__WIN32__)