--- loncom/auth/lonroles.pm	2006/05/30 21:16:40	1.152
+++ loncom/auth/lonroles.pm	2006/06/07 20:07:09	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.152 2006/05/30 21:16:40 raeburn Exp $
+# $Id: lonroles.pm,v 1.156 2006/06/07 20:07:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,7 +88,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());
 }
 
@@ -265,7 +265,7 @@ ENDENTERKEY
 			    return OK;
 			} else {
                             my $type = 'Course/Group';
-			    if ($env{'request.course.id'}) {
+			    if (!$env{'request.course.id'}) {
                                 if (defined($env{'course.'.
                                             $env{'request.course.id'}.'.type'})) {
                                     $type = $env{'course.'.
@@ -565,15 +565,9 @@ ENDHEADER
 		    $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/');
 		    $sortkey=$role;
                 } elsif ($trest) {
-                    $ttype='Course';
                     my $tcourseid=$tdom.'_'.$trest;
-                    if (defined($env{'course.'.$tcourseid.'.type'})) {
-                        $ttype = $env{'course.'.$tcourseid.'.type'};
-                        if ($ttype eq 'Group') {
-                            $trole = &Apache::loncommon::convert_role($trole,
-                                                                      $ttype);    
-                        }
-                    }
+                    $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;
@@ -592,10 +586,7 @@ ENDHEADER
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
                               '</font>';
                             $ttype = $newhash{'type'};
-                            if ($ttype eq 'Group') {
-                                $trole = &Apache::loncommon::convert_role(
-                                                                $trole,$ttype);
-                            }
+                            $trole = &Apache::lonnet::plaintext($role,$ttype);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -998,7 +989,6 @@ sub display_cc_role {
         if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) {
             my $tcourseid = $1.'_'.$2;
             my $trolecode = 'cc./'.$1.'/'.$2;
-            my $trole = Apache::lonnet::plaintext('cc');
             my $twhere;
             my $ttype;
             my $tbg='#77FF77';
@@ -1009,15 +999,12 @@ sub display_cc_role {
                         ' <font size="-2">'.
                         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont).
                         '</font>';
-                $ttype=$newhash{'type'};
-                if ($ttype eq 'Group') {
-                    $trole = &Apache::loncommon::convert_role($trole,$ttype);
-                }
+                $ttype = $newhash{'type'};
             } else {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
-                $ttype = 'Unavailable';
             }
+            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
             $twhere.="<br />".&mt('Domain').":".$1;
             $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,$twhere,'','','',1,'');
         }
@@ -1027,14 +1014,11 @@ sub display_cc_role {
 
 sub allcourses_row {
     my ($dcdom,$rowtype) = @_;
-    my $ccrole = Apache::lonnet::plaintext('cc');
     my $output = '<tr bgcolor="#77FF77">'.
                  ' <td colspan="5">';
     foreach my $type ('Course','Group') {
         my $selectlink = &courselink($dcdom,$rowtype,$type);
-        if ($type eq 'Group') {
-            $ccrole = &Apache::loncommon::convert_role($ccrole,$type);
-        }
+        my $ccrole = &Apache::lonnet::plaintext('cc',$type);
         $output.= '<font color="#002200">'.$ccrole.'</font>'.
               ' <b>'.$selectlink.'</b>'.
               ' from '.&mt('Domain').' '.$dcdom.'<br />';
@@ -1053,17 +1037,11 @@ 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,'','',$dcdom,$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'},