--- loncom/auth/lonroles.pm	2001/10/26 17:09:04	1.29
+++ loncom/auth/lonroles.pm	2002/02/01 12:54:51	1.34
@@ -1,15 +1,47 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
+#
+# $Id: lonroles.pm,v 1.34 2002/02/01 12:54:51 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Directory Indexer
 # (Login Screen
+# YEAR=1999
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
 # 11/23 Gerd Kortemeyer)
+# YEAR=2000
 # 1/14,03/06,06/01,07/22,07/24,07/25,
 # 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
 # 12/08,12/28,
+# YEAR=2001
 # 01/15/01 Gerd Kortemeyer
 # 02/27/01 Scott Harrison
 # 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
+# 12/21 Scott Harrison
+# 12/29 Gerd Kortemeyer
+#
+###
 
 package Apache::lonroles;
 
@@ -33,6 +65,10 @@ sub handler {
 # ================================================================== Roles Init
 
     if ($ENV{'form.selectrole'}) {
+	if ($ENV{'request.course.id'}) {
+	    my %temp=('logout_'.$ENV{'request.course.id'} => time);
+	    &Apache::lonnet::put('email_status',\%temp);
+        }
        &Apache::lonnet::appenv("request.course.id"  => '',
                                "request.course.fn"  => '',
                                "request.course.uri" => '',
@@ -77,13 +113,12 @@ sub handler {
 	 '<h1><font color=red>Could not initialize top-level map.</font></h1>';
                           }
 	                 $r->content_type('text/html');
+                         &Apache::loncommon::no_cache($r);
                          $r->send_http_header;
                          my $swinfo=&Apache::lonmenu::rawconfig;
-			 my $cacheheader=&Apache::loncommon::cacheheader();
                          print (<<ENDREDIR);
 <head><title>Entering Course</title>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$furl">
-$cacheheader
 </head>
 <html>
 <body bgcolor="#FFFFFF">
@@ -107,15 +142,14 @@ ENDREDIR
 # =============================================================== No Roles Init
 
     $r->content_type('text/html');
+    &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
 
     my $swinfo=&Apache::lonmenu::rawconfig;
-    my $cacheheader=&Apache::loncommon::cacheheader();
     $r->print(<<ENDHEADER);
 <html>
 <head>
-$cacheheader
 <title>LON-CAPA User Roles</title>
 </head><body bgcolor="#FFFFFF">
 <script>
@@ -274,6 +308,9 @@ ENDHEADER
                         $twhere='Currently not available';
                         $ENV{'course.'.$tcourseid.'.description'}=$twhere;
                     }
+		    if ($trole ne 'st') {
+		      $twhere.="<br />Domain:".$tdom;
+		    }
                 }
 	      }
             } elsif ($tdom) {
@@ -356,7 +393,7 @@ ENDHEADER
                 $twhere='/';
             }
             $r->print("\n<h3>".$ttype.': '.$twhere.'</h3><ul>');
-            map {
+            foreach (sort split(/:/,$ENV{$envkey})) {
               if ($_) {
 		  my ($prv,$restr)=split(/\&/,$_);
                   my $trestr='';
@@ -373,7 +410,7 @@ ENDHEADER
                   $r->print('<li>'.Apache::lonnet::plaintext($prv).$trestr.
                             '</li>');
 	      }
-            } sort split(/:/,$ENV{$envkey});
+            }
             $r->print('</ul>');
         }
     }
@@ -385,3 +422,67 @@ ENDHEADER
 
 1;
 __END__
+
+=head1 NAME
+
+Apache::lonroles - User Roles Screen
+
+=head1 SYNOPSIS
+
+Invoked by /etc/httpd/conf/srm.conf:
+
+ <Location /adm/roles>
+ PerlAccessHandler       Apache::lonacc
+ SetHandler perl-script
+ PerlHandler Apache::lonroles
+ ErrorDocument     403 /adm/login
+ ErrorDocument	  500 /adm/errorhandler
+ </Location>
+
+=head1 INTRODUCTION
+
+This module enables a user to select what role he wishes to
+operate under (instructor, student, teaching assistant, course
+coordinator, etc).  These roles are pre-established by the actions
+of upper-level users.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+Roles Initialization (yes/no)
+
+=item *
+
+Get Error Message from Environment
+
+=item *
+
+Who is this?
+
+=item *
+
+Generate Page Output
+
+=item *
+
+Choice or no choice
+
+=item *
+
+Table
+
+=item *
+
+Privileges
+
+=back
+
+=cut
