Changeset 935

Timestamp:

2000-02-17T15:34:09+13:00 (24 years ago)

Author:

sjboddie

Message:

made compressedoptions macro dm_safe - added SCRIPT_NAME to log string

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.46  2000/02/17 02:34:09  sjboddie
+   made compressedoptions macro dm_safe - added SCRIPT_NAME to log string
+
    Revision 1.45  2000/02/03 01:48:52  sjboddie
    fixed potential bug in ccscols stuff
@@ -739 +742 @@
   
   text_t host = gsdl_getenv ("REMOTE_HOST", fcgienv);
+  text_t script_name = gsdl_getenv ("SCRIPT_NAME", fcgienv);
   if (host.empty()) host = gsdl_getenv ("REMOTE_ADDR", fcgienv);
   text_t browser = gsdl_getenv ("HTTP_USER_AGENT", fcgienv);
@@ -758 +762 @@
   logfile = filename_cat (logfile, "usage.txt");
 
-  text_t logstr = host;
+  text_t logstr = script_name;
+  logstr += " " + host;
   logstr += " [";
   logstr += ttime;
@@ -1223 +1228 @@
   disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
   text_t compressedoptions = get_compressed_arg(args, logout);
-  disp.setmacro ("compressedoptions", "Global", compressedoptions);
+  disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
   // need a decoded version of compressedoptions for use within forms
   // as browsers encode values from forms before sending to server
   // (e.g. %25 becomes %2525)
   decode_cgi_arg (compressedoptions);
-  disp.setmacro ("decodedcompressedoptions", "Global", compressedoptions);
+  disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
 
   // set _cgiargX_ macros for each cgi argument
@@ -1246 +1251 @@
              "Global", html_safe((*argshere).second.value));
     else 
-      disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second.value);
+      disp.setmacro ("cgiarg" + (*argshere).first, "Global", dm_safe((*argshere).second.value));
     argshere ++;
   }