--- loncom/interface/loncreateuser.pm	2006/12/01 21:00:35	1.140
+++ loncom/interface/loncreateuser.pm	2006/12/01 21:52:29	1.141
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.140 2006/12/01 21:00:35 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.141 2006/12/01 21:52:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -624,7 +624,7 @@ END
                my $delallowed=0;
 	       my $sortkey=$role_code;
 	       my $class='Unknown';
-               if ($area =~ m{^/($match_domain)/($match_username)} ) {
+               if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
 		   $class='Course';
                    my ($coursedom,$coursedir) = ($1,$2);
 		   $sortkey.="\0$coursedom";
@@ -660,7 +660,7 @@ END
 		       }
 		   }
                    # Compute the background color based on $area
-                   if ($area=~m{^/($match_domain)/($match_username)/(\w+)}) {
+                   if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
                        $carea.='<br />Section: '.$3;
 		       $sortkey.="\0$3";
                    }
@@ -1274,7 +1274,7 @@ END
                      &Apache::lonnet::revokerole($env{'form.ccdomain'},
                      $env{'form.ccuname'},$1,$2).'</b><br />');
 		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_username)};
+		    $1=~m{^/($match_domain)/($match_courseid)};
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
@@ -1301,7 +1301,7 @@ END
                      &Apache::lonnet::assignrole($env{'form.ccdomain'},
                      $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
 		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_username)};
+		    $1=~m{^/($match_domain)/($match_courseid)};
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
@@ -1332,7 +1332,7 @@ END
                 my $logmsg;
                 my $output;
                 if ($role eq 'st') {
-                    if ($url =~ m-^/($match_domain)/($match_username)/?(\w*)$-) {
+                    if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
                         my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
                         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
                             $output = "Error: $result\n";
@@ -1363,7 +1363,7 @@ END
 	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
-	    if ($key=~/^form\.act\_($match_domain)\_($match_username)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
+	    if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
                 # Activate a custom role
 		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
 		my $url='/'.$one.'/'.$two;
@@ -1394,7 +1394,7 @@ END
 		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
-	    } elsif ($key=~/^form\.act\_($match_domain)\_($match_username)\_([^\_]+)$/) {
+	    } elsif ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_([^\_]+)$/) {
 		# Activate roles for sections with 3 id numbers
 		# set start, end times, and the url for the class
 		my ($one,$two,$three)=($1,$2,$3);