--- loncom/auth/lonroles.pm	2006/07/19 10:07:14	1.162.2.2
+++ loncom/auth/lonroles.pm	2006/11/23 01:49:41	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.162.2.2 2006/07/19 10:07:14 albertel Exp $
+# $Id: lonroles.pm,v 1.170 2006/11/23 01:49:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,8 +40,9 @@ use Apache::lonhtmlcommon;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonpageflip();
+use Apache::lonnavdisplay();
 use GDBM_File;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
  
 
 sub redirect_user {
@@ -53,8 +54,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
-						  ($url =~ m-^/adm/whatsnew-));
+	$navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
+						       ($url =~ m-^/adm/whatsnew-));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -125,7 +126,7 @@ sub handler {
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
                 if (my ($domain,$coursenum) =
-                                    ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-)) {
+		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_username)$-)) {
                     if ($dcroles{$domain}) {
                         &check_privs($domain,$coursenum,$then,$now);
                     }
@@ -312,7 +313,7 @@ ENDENTERKEY
 				    }
 				}
 # Are we allowed to look at the first resource?
-				if (!&Apache::lonnet::allowed('bre',$furl)) {
+				if ($furl !~ m|^/adm/|) {
 # Guess not ...
 				    $furl=&Apache::lonpageflip::first_accessible_resource();
 				}
@@ -485,8 +486,11 @@ ENDHEADER
 		$tstatus='selected';
             }
             my $tbg;
-            if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
-                ($env{'form.showall'})) {
+            if (($tstatus eq 'is') 
+		|| ($tstatus eq 'selected') 
+		|| ($tstatus eq 'will') 
+		|| ($tstatus eq 'future') 
+                || ($env{'form.showall'})) {
                 if ($tstatus eq 'is') {
                     $tbg='#77FF77';
                     $tfont='#003300';
@@ -635,7 +639,7 @@ ENDHEADER
 # More than one possible role
 # ----------------------------------------------------------------------- Table
     unless (($advanced) || ($nochoose)) {
-	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
+	$r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
     }
     $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
@@ -659,7 +663,8 @@ ENDHEADER
 	foreach (sort(keys(%recent_roles))) {
 	    if (defined($roletext{'user.role.'.$_})) {
 		$output.=$roletext{'user.role.'.$_};
-                if ($_ =~ m-dc\./(\w+)/- && $dcroles{$1}) {
+                if ($_ =~ m-dc\./($match_domain)/- 
+		    && $dcroles{$1}) {
 		    $output .= &allcourses_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
@@ -686,7 +691,7 @@ ENDHEADER
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
 		$output.=$roletext{$sortrole{$which}};
-                if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
+                if ($sortrole{$which} =~ m-dc\./($match_domain)/-) {
                     if ($dcroles{$1}) {
                         $output .= &allcourses_row($1,'');
                     }
@@ -831,7 +836,7 @@ sub build_roletext {
                 $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
-                $roletext.=('<td>&nbsp;</td>');
+                $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
             }
         } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
@@ -851,9 +856,10 @@ sub build_roletext {
             $roletext.='<td'.$rowspan.'>&nbsp;</td>';
         }
     }
-    $tremark.=&Apache::lonannounce::showday(time,1,
-                 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
-
+    if ($trolecode !~ m/^(dc|ca|au|aa)\./) {
+	$tremark.=&Apache::lonannounce::showday(time,1,
+			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
+    }
     $roletext.='<td><font color="'.$tfont.'">'.$trole.
 	       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                '</font></td><td><font color="'.$tfont.'">'.$tpstart.
@@ -885,7 +891,7 @@ sub check_fordc {
     my $numdc = 0;
     if ($env{'user.adv'}) {
         foreach my $envkey (sort keys %env) {
-            if ($envkey=~/^user\.role\.dc\.\/(\w+)\/$/) {
+            if ($envkey=~/^user\.role\.dc\.\/($match_domain)\/$/) {
                 my $dcdom = $1;
                 my $livedc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
@@ -982,7 +988,7 @@ sub display_cc_role {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
+        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_username)$-) {
             my $tcourseid = $1.'_'.$2;
             my $trolecode = 'cc./'.$1.'/'.$2;
             my $twhere;
@@ -1012,7 +1018,7 @@ sub allcourses_row {
     my ($dcdom,$rowtype) = @_;
     my $output = '<tr bgcolor="#77FF77">'.
                  ' <td colspan="5">';
-    foreach my $type ('Course') {
+    foreach my $type ('Course','Group') {
         my $selectlink = &courselink($dcdom,$rowtype,$type);
         my $ccrole = &Apache::lonnet::plaintext('cc',$type);
         $output.= '<font color="#002200">'.$ccrole.'</font>'.
@@ -1033,7 +1039,9 @@ sub set_privileges {
     my $area = '/'.$dcdom.'/'.$pickedcourse;
     my $role = 'cc';
     my $spec = $role.'.'.$area;
-    my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'});
+    my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
+						  $env{'user.domain'},
+						  $env{'user.name'});
     my %ccrole = ();
     &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
     my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);