Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/authenaction.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/authenaction.cpp (modified) (3 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/authenaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9.4.1  2000/07/12 22:21:34  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.10  2000/04/19 22:30:23  sjboddie
+   tidied up status pages and end-user collection building
+
    Revision 1.9  1999/11/01 21:11:35  sjboddie
    changed arguments passed to many functions
@@ -300 +306 @@
                          + "_"));
   // change style of header and footer if page is a frame
-  if (args["sp"] != "frameset") {
+  if ((args["sp"].empty()) || (args["sp"] == "frameset")) {
     disp.setmacro ("header", "authen", "_status:infoheader_(Log in)");
     disp.setmacro ("header", "authenok", "_status:infoheader_(Log in)");
@@ -306 +312 @@
     disp.setmacro ("footer", "authenok", "_status:infofooter_(Log in)");
   }
-  else {
-    //    disp.setmacro ("header", "authen", "_Global:header_"); //****
-    //    disp.setmacro ("header", "authenok", "_Global:header_");
-    //    disp.setmacro ("footer", "authen", "_Global:footer_");
-    //    disp.setmacro ("footer", "authenok", "_Global:footer_");
-    disp.setmacro ("header", "authen", "_:header_");
-    disp.setmacro ("header", "authenok", "_:header_");
-    disp.setmacro ("footer", "authen", "_:footer_");
-    disp.setmacro ("footer", "authenok", "_:footer_");
-  }
-    
 
   // get a list of saved configuration arguments (if possible)