Changeset 362 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

1999-07-11T10:18:26+12:00 (25 years ago)

Author:

rjmcnab

Message:

Added calls to define_external_cgiargs.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.17  1999/07/10 22:18:26  rjmcnab
+   Added calls to define_external_cgiargs.
+
    Revision 1.16  1999/06/27 21:49:03  sjboddie
    fixed a couple of version conflicts - tidied up some small things
@@ -261 +264 @@
   add_default_args (argsinfo, args, logout);
 
+  
+  // get the input encoding
+  text_t &arg_w = args["w"];
+  inconvertclass defaultinconvert;
+  inconvertclass *inconvert = converters.get_inconverter (arg_w);
+  if (inconvert == NULL) inconvert = &defaultinconvert;
+
+  // see if the next page will have a different encoding
+  if (args.getarg("nw") != NULL) arg_w = args["nw"];
+
+  // convert arguments which aren't in unicode to unicode
+  args_tounicode (args, *inconvert);
+
+
+  // decide on the output conversion class (needed for checking the external
+  // cgi arguments)
+  rzwsoutconvertclass defaultoutconverter;
+  rzwsoutconvertclass *outconverter = converters.get_outconverter (arg_w);
+  if (outconverter == NULL) outconverter = &defaultoutconverter;
+  outconverter->reset();
+
+
   // check the main cgi arguments
   if (!check_mainargs (args, logout)) return false;
@@ -275 +300 @@
   }
 
-  // get the input encoding
-  text_t &arg_w = args["w"];
-  inconvertclass defaultinconvert;
-  inconvertclass *inconvert = converters.get_inconverter (arg_w);
-  if (inconvert == NULL) inconvert = &defaultinconvert;
-
-  // see if the next page will have a different encoding
-  if (args.getarg("nw") != NULL) args["w"] = args["nw"];
-
-  // convert arguments which aren't in unicode to unicode
-  args_tounicode (args, *inconvert);
+  // check external cgi arguments for each action
+  actionptrmap::iterator actionhere = actions.begin ();
+  actionptrmap::iterator actionend = actions.end ();
+  while (actionhere != actionend) {
+    assert ((*actionhere).second.a != NULL);
+    if ((*actionhere).second.a != NULL) {
+      if (!(*actionhere).second.a->check_external_cgiargs (argsinfo, args, *outconverter,
+                               configinfo.saveconf, logout))
+    return false;
+    }
+    actionhere++;
+  }
+
+  // the action might have changed but we will assume that
+  // the cgiargs were checked properly when the change was made
 
   return true;
@@ -399 +428 @@
 // returns the compressed argument ("e") corresponding to the argument
 // list. This can be used to save preferences between sessions.
-text_t receptionist::get_compressed_arg (cgiargsclass &args, outconvertclass &outconvert,
-                     ostream &logout) {
-  
+text_t receptionist::get_compressed_arg (cgiargsclass &args, ostream &logout) {
+  // decide on the output conversion class
+  text_t &arg_w = args["w"];
+  rzwsoutconvertclass defaultoutconverter;
+  rzwsoutconvertclass *outconverter = converters.get_outconverter (arg_w);
+  if (outconverter == NULL) outconverter = &defaultoutconverter;
+  outconverter->reset();
+
   text_t compressed_args;
   if (compress_save_args (argsinfo, configinfo.saveconf, args, 
-              compressed_args, outconvert, logout))
+              compressed_args, *outconverter, logout))
     return compressed_args;
-  else 
-    return "";
+
+  return "";
 }
 
@@ -634 +668 @@
 }
 
-void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
+void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &/*outconvert*/,
                       ostream &logout) {
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
   disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
-  disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, outconvert, logout));
+  disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, logout));
 
   // set _cgiargX_ macros for each cgi argument