--- loncom/auth/lonroles.pm	2001/02/27 20:44:18	1.22
+++ loncom/auth/lonroles.pm	2001/07/06 15:11:19	1.27
@@ -9,6 +9,7 @@
 # 12/08,12/28,
 # 01/15/01 Gerd Kortemeyer
 # 02/27/01 Scott Harrison
+# 03/02,05/03,05/25,05/30,06/01,07/06 Gerd Kortemeyer
 
 package Apache::lonroles;
 
@@ -17,6 +18,7 @@ use Apache::lonnet();
 use Apache::lonuserstate();
 use Apache::Constants qw(:common);
 use Apache::File();
+use Apache::lonmenu;
 
 sub handler {
 
@@ -57,7 +59,8 @@ sub handler {
                    my ($cdom,$cnum,$csec)=split(/\//,$where);
                    &Apache::lonnet::appenv('request.role' => $trolecode,
                                            'request.course.sec' => $csec);
-                   if ($cnum) {
+                   my $msg='Entering course ...';
+                   if (($cnum) && ($role ne 'ca')) {
 		      my ($furl,$ferr)=
 			  &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                       if (($ENV{'form.orgurl'}) && 
@@ -65,15 +68,26 @@ sub handler {
                          $r->internal_redirect($ENV{'form.orgurl'});
                          return OK;
 		     } else {
+                         unless ($ENV{'request.course.id'}) {
+                             &Apache::lonnet::appenv(
+				 "request.course.id"  => $cdom.'_'.$cnum);
+                             $furl='/adm/notfound.html';
+                             $msg=
+	 '<h1><font color=red>Could not initialize top-level map.</font></h1>';
+                          }
 	                 $r->content_type('text/html');
                          $r->send_http_header;
+                         my $swinfo=&Apache::lonmenu::rawconfig;
                          print (<<ENDREDIR);
 <head><title>Entering Course</title>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$furl">
 </head>
 <html>
 <body bgcolor="#FFFFFF">
-Entering course ...
+<script>
+$swinfo
+</script>
+$msg
 </body>
 </html>
 ENDREDIR
@@ -93,12 +107,17 @@ ENDREDIR
     $r->send_http_header;
     return OK if $r->header_only;
 
+    my $swinfo=&Apache::lonmenu::rawconfig;
+
     $r->print(<<ENDHEADER);
 <html>
 <head>
 <title>LON-CAPA User Roles</title>
 </head><body bgcolor="#FFFFFF">
-<script>window.focus();</script>
+<script>
+$swinfo
+window.focus();
+</script>
 ENDHEADER
 
 # ------------------------------------------ Get Error Message from Environment
@@ -129,6 +148,11 @@ ENDHEADER
         $r->print("Action  : $msg\n</pre><hr>");
     } else {
         $r->print("<h1>LON-CAPA User Roles</h1>");
+        if ($ENV{'user.error.msg'}) {
+	    $r->print(
+ '<h3><font color=red>You need to choose another user role or '.
+ 'enter a specific course for this function</font></h3>');
+	}
     }
 # -------------------------------------------------------- Choice or no choice?
     if ($nochoose) {
@@ -157,6 +181,9 @@ ENDHEADER
         $r->print('<input type=hidden name=orgurl value="'.$fn.'">');
         $r->print('<input type=hidden name=selectrole value=1>');
     }
+    $r->print('<br>Show all roles: <input type=checkbox name=showall');
+    if ($ENV{'form.showall'}) { $r->print(' checked'); }
+    $r->print('><input type=submit value="Display"><br>');
 # ----------------------------------------------------------------------- Table
     $r->print('<table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
@@ -181,14 +208,19 @@ ENDHEADER
                 $tpstart=localtime($tstart);
             }
             if ($tend) {
-                if ($tend<$then) { $tstatus='expired'; }
-                if ($tend<$now) { $tstatus='will_not'; }
+                if ($tend<$then) { 
+                   $tstatus='expired'; 
+                } elsif ($tend<$now) { 
+                   $tstatus='will_not'; 
+                }
                 $tpend=localtime($tend);
             }
             if ($ENV{'request.role'} eq $trolecode) {
 		$tstatus='selected';
             }
             my $tbg;
+           if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
+               ($ENV{'form.showall'})) {
             if ($tstatus eq 'is') {
 		$tbg='#77FF77';
             } elsif ($tstatus eq 'future') {
@@ -218,6 +250,11 @@ ENDHEADER
             my ($tdom,$trest,$tsection)=
                split(/\//,Apache::lonnet::declutter($where));
             if ($trest) {
+	      if ($role eq 'ca') {
+	        $ttype='Construction Space';
+                $twhere='User: '.$trest.'<br>Domain: '.$tdom;
+                $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+              } else {
 		$ttype='Course';
                 if ($tsection) {
                    $ttype.='<br>Section/Group: '.$tsection;
@@ -234,6 +271,7 @@ ENDHEADER
                         $ENV{'course.'.$tcourseid.'.description'}=$twhere;
                     }
                 }
+	      }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
@@ -255,6 +293,7 @@ ENDHEADER
 		      $ttype.'</td><td>'.$twhere.'</td><td>'.$tpstart.
                       '</td><td>'.$tpend.
                       '</td><td>'.$tremark.'&nbsp;</td></tr>'."\n");
+	}
         }
     }
     my $tremark='';
@@ -291,11 +330,16 @@ ENDHEADER
             my ($tdom,$trest,$tsec)=
                split(/\//,Apache::lonnet::declutter($where));
             if ($trest) {
+	      if ($ENV{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
+	        $ttype='Construction Space';
+                $twhere='User: '.$trest.', Domain: '.$tdom;
+              } else {
 		$ttype='Course';
                 $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'};
                 if ($tsec) {
 		    $twhere.=' (Section/Group: '.$tsec.')';
                 }
+	      }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
