--- loncom/auth/lonroles.pm	2006/05/30 19:47:36	1.151
+++ loncom/auth/lonroles.pm	2007/03/02 23:17:48	1.176
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.151 2006/05/30 19:47:36 www Exp $
+# $Id: lonroles.pm,v 1.176 2007/03/02 23:17:48 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();
     }
@@ -88,7 +89,7 @@ sub error_page {
 	      &Apache::lonmenu::rawconfig().'</script>'.
 	      '<p>'.&mt('The following problems occurred:').
 	      $error.
-	      '</p><br /><a href="'.$dest.'>'.&mt('Continue').'</a>'.
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
 	      &Apache::loncommon::end_page());
 }
 
@@ -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_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &check_privs($domain,$coursenum,$then,$now);
                     }
@@ -149,8 +150,10 @@ sub handler {
 
 # store role if recent_role list being kept
                     if ($env{'environment.recentroles'}) {
+                        my %frozen_roles =
+                           &Apache::lonhtmlcommon::get_recent_frozen('roles',$env{'environment.recentrolesn'});
 			&Apache::lonhtmlcommon::store_recent('roles',
-							     $trolecode,' ');
+							     $trolecode,' ',$frozen_roles{$trolecode});
                     }
 
 
@@ -162,7 +165,7 @@ sub handler {
 			my $authnum=$cnum;
 			if ($env{'course.'.$cdom.'_'.$cnum.'.keyauth'}) {
 			    ($authnum,$authdom)=
-				split(/\W/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'});
+				split(/:/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'});
 			}
 # check with key authority
 			unless (&Apache::lonnet::validate_access_key(
@@ -247,9 +250,9 @@ ENDENTERKEY
 					   'request.course.sec'  => $csec,
                                            'request.course.groups' => $cgrps);
                     my $tadv=0;
-		    my $msg=&mt('Entering course ...');
 
 		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
+                        my $msg;
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($env{'form.orgurl'}) && 
@@ -264,17 +267,19 @@ ENDENTERKEY
 			    }
 			    return OK;
 			} else {
-			    unless ($env{'request.course.id'}) {
+			    if (!$env{'request.course.id'}) {
 				&Apache::lonnet::appenv(
 				      "request.course.id"  => $cdom.'_'.$cnum);
 				$furl='/adm/roles?tryagain=1';
 				$msg=
-				    '<h1><font color="red">'.
-			 &mt('Could not initialize course at this time.').
-		    '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
+				    '<h1><span class="LC_error">'.
+				    &mt('Could not initialize [_1] at this time.',
+					$env{'course.'.$cdom.'_'.$cnum.'.description'}).
+				    '</span></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
 			    }
 			    if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
 			    &Apache::lonnet::appenv('request.role.adv'=>$tadv);
+
 			    if (($ferr) && ($tadv)) {
 				&error_page($r,$ferr,$furl);
 			    } else {
@@ -298,7 +303,8 @@ ENDENTERKEY
 					) {
 					my $startpage = &courseloadpage($courseid);
 					unless ($startpage eq 'firstres') {         
-					    $msg = &mt('Entering course ....');
+					    $msg = &mt('Entering [_1] ....',
+						       $env{'course.'.$courseid.'.description'});
 					    &redirect_user($r,&mt('New in course'),
 							   '/adm/whatsnew?refpage=start',$msg,
 							   $env{'environment.remotenavmap'});
@@ -307,11 +313,14 @@ 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();
 				}
-				&redirect_user($r,&mt('Entering Course'),
+                                $msg = &mt('Entering [_1] ...',
+					   $env{'course.'.$courseid.'.description'});
+				&redirect_user($r,&mt('Entering [_1]',
+						      $env{'course.'.$courseid.'.description'}),
 					       $furl,$msg,
 					       $env{'environment.remotenavmap'});
 			    }
@@ -356,10 +365,10 @@ ENDENTERKEY
     my $start_page=&Apache::loncommon::start_page('User Roles');
     my $standby=&mt('Role selected. Please stand by.');
     $standby=~s/\n/\\n/g;
-    my $helptag='<table><tr><td>'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'</td></td></tr></table>';
+
     $r->print(<<ENDHEADER);
 $start_page
-$helptag<br />
+<br />
 <script>
 $swinfo
 window.focus();
@@ -398,10 +407,17 @@ ENDHEADER
 # --------------------------------------------------------------- Error Header?
     if ($error) {
 	$r->print("<h1>LON-CAPA Access Control</h1>");
-        $r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access  : ".
-                  Apache::lonnet::plaintext($priv)."\n");
-        $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
-        $r->print("Action  : $msg\n</pre><hr />");
+	$r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>");
+	if ($priv ne '') {
+	    $r->print("Access  : ".&Apache::lonnet::plaintext($priv)."\n");
+	}
+	if ($fn ne '') {
+	    $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
+	}
+	if ($msg ne '') {
+	    $r->print("Action  : $msg\n");
+	}
+	$r->print("</pre><hr />");
 	my $url=$fn;
 	my $last;
 	if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
@@ -416,8 +432,8 @@ ENDHEADER
     } else {
         if ($env{'user.error.msg'}) {
 	    $r->print(
- '<h3><font color="red">'.
- &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');
+ '<h3><span class="LC_error">'.
+ &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
 	}
     }
 # -------------------------------------------------------- Choice or no choice?
@@ -429,8 +445,8 @@ ENDHEADER
     } else {
         if ($advanced) {
 	    $r->print(&mt("Your home server is ").
-		      $Apache::lonnet::hostname{&Apache::lonnet::homeserver
-                      ($env{'user.name'},$env{'user.domain'})}.
+		      &Apache::lonnet::hostname(&Apache::lonnet::homeserver
+                      ($env{'user.name'},$env{'user.domain'})).
 		      "<br />\n");
 	    $r->print(&mt(
       "Author and Co-Author roles are not available on servers other than their respective home servers."));
@@ -477,8 +493,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';
@@ -510,10 +529,8 @@ ENDHEADER
 		    if ($tremark) { $tremark.='<br />'; }
                     $tremark.=&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
-                    $trole=$rrole;
-                } else {
-                    $trole=Apache::lonnet::plaintext($role);
-                }
+		}
+		$trole=Apache::lonnet::plaintext($role);
                 my $ttype;
                 my $twhere;
                 my ($tdom,$trest,$tsection)=
@@ -529,7 +546,7 @@ ENDHEADER
                         $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
-                    $home = $Apache::lonnet::hostname{$home};
+                    $home = &Apache::lonnet::hostname($home);
                     $ttype='Construction Space';
                     $twhere=&mt('User').': '.$trest.'<br />'.&mt('Domain').
 			': '.$tdom.'<br />'.
@@ -549,7 +566,7 @@ ENDHEADER
                         $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
-                    $home = $Apache::lonnet::hostname{$home};
+                    $home = &Apache::lonnet::hostname($home);
                     $ttype='Construction Space';
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
 			':&nbsp;'.$home;
@@ -557,8 +574,9 @@ ENDHEADER
 		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
 		    $sortkey=$role;
                 } elsif ($trest) {
-                    $ttype='Course';
                     my $tcourseid=$tdom.'_'.$trest;
+                    $ttype = &Apache::loncommon::course_type($tcourseid);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype);
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
 			$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -576,16 +594,18 @@ ENDHEADER
                               ' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
                               '</font>';
+                            $ttype = $newhash{'type'};
+                            $trole = &Apache::lonnet::plaintext($role,$ttype);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
+                            $ttype = 'Unavailable';
                         }
                     }
                     if ($tsection) {
-                        $twhere.='<br />'.&mt('Section/Group').': '.$tsection;
+                        $twhere.='<br />'.&mt('Section').': '.$tsection;
 		    }
-
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -596,8 +616,7 @@ ENDHEADER
                     $twhere=&mt('system wide');
 		    $sortkey=$role.$twhere;
                 }
- 
-                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
+                $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver);
 		$roletext{$envkey}=$roletext;
 		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
 		$sortrole{$sortkey}=$envkey;
@@ -634,7 +653,7 @@ ENDHEADER
     $r->print('<th>'.&mt('User Role').'</th><th>'.&mt('Extent').
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>'."\n");
     my $doheaders=-1;
-    foreach my $type ('Domain','Construction Space','Course','System') {
+    foreach my $type ('Domain','Construction Space','Course','Unavailable','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -651,7 +670,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) {
@@ -673,12 +693,12 @@ ENDHEADER
         $r->print(&coursepick_jscript());
         $r->print(&Apache::loncommon::coursebrowser_javascript());
     }
-    foreach my $type ('Construction Space','Domain','Course','System') {
+    foreach my $type ('Construction Space','Domain','Course','Unavailable','System') {
 	my $output;
 	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,'');
                     }
@@ -721,56 +741,7 @@ ENDHEADER
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
 	$r->print('<hr /><h2>Current Privileges</h2>');
-
-	foreach $envkey (sort keys %env) {
-	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
-		my $where=$envkey;
-		$where=~s/^user\.priv\.$env{'request.role'}\.//;
-		my $ttype;
-		my $twhere;
-		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;
-		} else {
-		    $ttype='System';
-		    $twhere='/';
-		}
-		$r->print("\n<h3>".$ttype.': '.$twhere.'</h3><ul>');
-		foreach (sort split(/:/,$env{$envkey})) {
-		    if ($_) {
-			my ($prv,$restr)=split(/\&/,$_);
-			my $trestr='';
-			if ($restr ne 'F') {
-			    my $i;
-			    $trestr.=' (';
-			    for ($i=0;$i<length($restr);$i++) {
-				$trestr.=
-			       Apache::lonnet::plaintext(substr($restr,$i,1));
-				if ($i<length($restr)-1) { $trestr.=', '; }
-			    }
-			    $trestr.=')';
-			}
-			$r->print('<li>'.
-				  Apache::lonnet::plaintext($prv).$trestr.
-				  '</li>');
-		    }
-		}
-		$r->print('</ul>');
-	    }
-	}
+	$r->print(&privileges_info());
     }
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
@@ -782,6 +753,61 @@ ENDHEADER
     return OK;
 }
 
+sub privileges_info {
+    my ($which) = @_;
+    my $output;
+
+    $which ||= $env{'request.role'};
+
+    foreach my $envkey (sort(keys(%env))) {
+	next if ($envkey!~/^user\.priv\.\Q$which\E\.(.*)/);
+
+	my $where=$1;
+	my $ttype;
+	my $twhere;
+	my (undef,$tdom,$trest,$tsec)=split(m{/},$where);
+	if ($trest) {
+	    if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
+		$ttype='Construction Space';
+		$twhere='User: '.$trest.', Domain: '.$tdom;
+	    } else {
+		$ttype= &Apache::loncommon::course_type($tdom.'_'.$trest);
+		$twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
+		if ($tsec) {
+		    my $sec_type = 'Section';
+		    if (exists($env{"user.role.gr.$where"})) {
+			$sec_type = 'Group';
+		    }
+		    $twhere.=' ('.$sec_type.': '.$tsec.')';
+		}
+	    }
+	} elsif ($tdom) {
+	    $ttype='Domain';
+	    $twhere=$tdom;
+	} else {
+	    $ttype='System';
+	    $twhere='/';
+	}
+	$output .= "\n<h3>".$ttype.': '.$twhere.'</h3>'."\n<ul>";
+	foreach my $priv (sort(split(/:/,$env{$envkey}))) {
+	    next if (!$priv);
+
+	    my ($prv,$restr)=split(/\&/,$priv);
+	    my $trestr='';
+	    if ($restr ne 'F') {
+		$trestr.=' ('.
+		    join(', ',
+			 map { &Apache::lonnet::plaintext($_) } 
+			     (split('',$restr))).') ';
+	    }
+	    $output .= "\n\t".
+		'<li>'.&Apache::lonnet::plaintext($prv).$trestr.'</li>';
+	}
+	$output .= "\n".'</ul>';
+    }
+    return $output;
+}
+
 sub role_status {
     my ($rolekey,$then,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_;
     my @pwhere = ();
@@ -808,7 +834,7 @@ sub role_status {
 }
 
 sub build_roletext {
-    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
+    my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_;
     my $roletext='<tr bgcolor="'.$tbg.'">';
     my $is_dc=($trolecode =~ m/^dc\./);
     my $rowspan=($is_dc) ? ''
@@ -822,7 +848,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="'.
@@ -842,9 +868,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.
@@ -876,7 +903,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});
@@ -893,9 +920,11 @@ sub check_fordc {
 }
 
 sub courselink {
-    my ($dcdom,$rowtype) = @_;
+    my ($dcdom,$rowtype,$selecttype) = @_;
     my $courseform=&Apache::loncommon::selectcourse_link
-                     ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.$dcdom,$dcdom);
+                   ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
+                    'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
+                    $dcdom,$dcdom,undef);
     my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
@@ -971,11 +1000,11 @@ 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_courseid)$-) {
             my $tcourseid = $1.'_'.$2;
             my $trolecode = 'cc./'.$1.'/'.$2;
-            my $trole = Apache::lonnet::plaintext('cc');
             my $twhere;
+            my $ttype;
             my $tbg='#77FF77';
             my $tfont='#003300';
             my %newhash=&Apache::lonnet::coursedescription($tcourseid);
@@ -984,27 +1013,29 @@ sub display_cc_role {
                         ' <font size="-2">'.
                         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
                         '</font>';
+                $ttype = $newhash{'type'};
             } else {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
+            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
             $twhere.="<br />".&mt('Domain').":".$1;
-            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,'');
+            $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,$twhere,'','','',1,'');
         }
     }
-    return $roletext;
+    return ($roletext);
 }
 
 sub allcourses_row {
     my ($dcdom,$rowtype) = @_;
-    my $ccrole = Apache::lonnet::plaintext('cc');
-    my $selectlink = &courselink($dcdom,$rowtype);
     my $output = '<tr bgcolor="#77FF77">'.
-	'<td colspan="5">'.
-	'<font color="#002200">'.$ccrole.'</font>'.
-	' <b>'.$selectlink.'</b>'.
-	' from '.&mt('Domain').' '.$dcdom.
-	'<tr><td colspan="5" height="3"></td></tr>'."\n";
+                 ' <td colspan="5">';
+    my $selectlink = &courselink($dcdom,$rowtype);
+    my $ccrole = &Apache::lonnet::plaintext('cc');
+    $output.= '<font color="#002200">'.$ccrole.'</font>'.
+              ' <b>'.$selectlink.'</b>'.
+              ' from '.&mt('Domain').' '.$dcdom.'<br />';
+    $output .= '</tr><tr><td colspan="5" height="3"></td></tr>'."\n";
     return $output;
 }
 
@@ -1018,17 +1049,13 @@ 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);
-    my @newprivs = split/\n/,$userroles;
-    my %newccroles = ();
-    foreach (@newprivs) {
-        my ($key,$val) = split/=/,$_;
-        $newccroles{$key} = $val;
-    }
-    &Apache::lonnet::appenv(%newccroles);
+    my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);
+    &Apache::lonnet::appenv(%userroles);
     &Apache::lonnet::log($env{'user.domain'},
                          $env{'user.name'},
                          $env{'user.home'},