--- loncom/auth/lonroles.pm	2006/06/02 13:58:37	1.153
+++ loncom/auth/lonroles.pm	2006/06/02 22:02:51	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.153 2006/06/02 13:58:37 raeburn Exp $
+# $Id: lonroles.pm,v 1.155 2006/06/02 22:02:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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.'.
@@ -1037,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'},