--- loncom/auth/lonroles.pm	2001/02/27 20:44:18	1.22
+++ loncom/auth/lonroles.pm	2001/05/03 17:54:12	1.24
@@ -9,6 +9,7 @@
 # 12/08,12/28,
 # 01/15/01 Gerd Kortemeyer
 # 02/27/01 Scott Harrison
+# 03/02,05/03 Gerd Kortemeyer
 
 package Apache::lonroles;
 
@@ -181,8 +182,11 @@ 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) {
@@ -218,6 +222,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 +243,7 @@ ENDHEADER
                         $ENV{'course.'.$tcourseid.'.description'}=$twhere;
                     }
                 }
+	      }
             } elsif ($tdom) {
                 $ttype='Domain';
                 $twhere=$tdom;
@@ -291,11 +301,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;