Changeset 507 for trunk/gsdl/src/recpt/authenaction.cpp

Timestamp:

1999-09-02T12:23:24+12:00 (25 years ago)

Author:

rjmcnab

Message:

a couple of minor things

File:

• trunk/gsdl/src/recpt/authenaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/authenaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/09/02 00:23:24  rjmcnab
+   a couple of minor things
+
    Revision 1.4  1999/07/30 02:24:43  sjboddie
    added collectinfo argument to some functions
@@ -170 +173 @@
   text_t &args_pw = args["pw"];    text_t &args_us = args["us"];
   text_t &args_ug = args["ug"];    text_t &args_ky = args["ky"];
-  text_t &args_ua = args["ua"];
+  text_t &args_ua = args["ua"];    text_t &args_a = args["a"];
 
   // we must have a username and a password or a key to
@@ -223 +226 @@
     args_ua.clear();
     args_us = "permissiondenied";
-    args_ug.clear();
     args_ky.clear();
       }
@@ -231 +233 @@
       args_ua.clear();
       args_us = "disabled";
-      args_ug.clear();
       args_ky.clear();
     }
@@ -237 +238 @@
   } else {
     // failure, reset info about the user
-    args_ug.clear();
     args_ky.clear();
   }
@@ -243 +243 @@
   // we will have to redirect the user if authentication is needed,
   // it failed, and we weren't on our way to be authenticated anyway
-  if (!args_uan.empty() && args_ua.empty() && args["a"] != "a") {
+  if ((!args_uan.empty()) && (args_ua.empty()) && (args_a != "a")) {
     // need to save the current arguments in "er"
     text_t &arg_er = args["er"];
@@ -250 +250 @@
     
     // redirect to this action
-    args["a"] = "a";
+    args_a = "a";
   }