Changeset 3217

Timestamp:

2002-07-05T12:13:22+12:00 (22 years ago)

Author:

jrm21

Message:

cgisafe: now properly encodes unicode characters, which is important if we
link to a query on someone's name.

File:

• trunk/gsdl/src/recpt/cgiutils.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -26 +26 @@
 #include "cgiutils.h"
 #include "gsdlunicode.h"
+#include "unitool.h" // in mg, for output_utf8_char
 
 static unsigned short hexdigit (unsigned short c) {
@@ -57 +58 @@
 
 // convert %xx and + to their appropriate equivalents
-// IE 6.0 and later use "%u" followed by 4 hex digits...
+// IE 6.0 and later use "%u" followed by 4 hex digits... MS IIS extension!
 void decode_cgi_arg (text_t &argstr) {
   text_t::iterator in = argstr.begin();
@@ -221 +222 @@
       // space
       outtext.push_back('+');
+    } else if (c > 255) { // unicode character
+      unsigned char buf[3]; // up to 3 bytes
+      buf[0]='\0';buf[1]='\0';buf[2]='\0';
+      output_utf8_char(c,buf, buf+2);
+      outtext.push_back('%');
+      c2hex(buf[0], ttmp);
+      outtext += ttmp;
+      outtext.push_back('%');
+      c2hex(buf[1], ttmp);
+      outtext += ttmp;
+      if (buf[2]) {
+      outtext.push_back('%');
+      c2hex(buf[2], ttmp);
+      outtext += ttmp;
+      }
     } else {
       // everything else