--- loncom/interface/loncreateuser.pm	2007/08/02 01:07:00	1.168
+++ loncom/interface/loncreateuser.pm	2007/08/10 23:01:51	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.168 2007/08/02 01:07:00 albertel Exp $
+# $Id: loncreateuser.pm,v 1.170 2007/08/10 23:01:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1136,7 +1136,7 @@ ENDNOPRIV
            <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
              <a href=
 "javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
           &Apache::loncommon::end_data_table_row()."\n".
@@ -1144,10 +1144,10 @@ ENDNOPRIV
 '<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
 <td>'.$lt{'caa'}.'</td>
 <td>'.$cudom.'_'.$cuname.'</td>
-<td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
+<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
 "javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
          &Apache::loncommon::end_data_table_row()."\n".
@@ -1179,10 +1179,10 @@ ENDNOPRIV
 '<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>
-<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="" />
+<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
 "javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
-<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="" />
+<td><input type="hidden" name="end_'.$thisdomain.'_'.$role.'" value="" />
 <a href=
 "javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
 &Apache::loncommon::end_data_table_row();
@@ -1537,23 +1537,20 @@ END
 	if ($key=~/^form\.rev/) {
 	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role
-	        $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
-                     &Apache::lonnet::revokerole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2).'</b><br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
-		    my $result = 
-			&Apache::lonnet::cput('classlist',
-					      { $user => $now },
-					      $env{'course.'.$cid.'.domain'},
-					      $env{'course.'.$cid.'.num'});
-		    $r->print(&mt('Drop from classlist: [_1]',
-				  '<b>'.$result.'</b>').'<br />');
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role);
+	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
+			      $role,$scope,'<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
+						 $env{'form.ccdomain'},$now);
+		    $r->print($result);
 		}
 	    } 
-	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
@@ -1564,26 +1561,23 @@ END
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
-	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
-		    my $result = 
-			&Apache::lonnet::cput('classlist',
-					      { $user => $now },
-					      $env{'course.'.$cid.'.domain'},
-					      $env{'course.'.$cid.'.num'});
-		    $r->print(&mt('Drop from classlist: [_1]',
-				  '<b>'.$result.'</b>').'<br />');
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role,$now,0,1);
+	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
+			      '<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
+						 $env{'form.ccdomain'},$now);
+		    $r->print($result);
 		}
             }
 	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
                 my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
 # Delete custom role
-                $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]',
+                $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
                       $rolename,$rnam,$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
@@ -1760,6 +1754,30 @@ END
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub classlist_drop {
+    my ($scope,$uname,$udom,$now) = @_;
+    my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+    my $cid=$cdom.'_'.$cnum;
+    my $user = $uname.':'.$udom;
+    if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+	my $result = 
+	    &Apache::lonnet::cput('classlist',
+				  { $user => $now },
+				  $env{'course.'.$cid.'.domain'},
+				  $env{'course.'.$cid.'.num'});
+	return &mt('Drop from classlist: [_1]',
+		   '<b>'.$result.'</b>').'<br />';
+    }
+}
+
+sub active_student_role {
+    my ($cnum,$cdom,$uname,$udom) = @_;
+    my %roles = 
+	&Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+				      ['future','active'],['st']);
+    return exists($roles{"$cnum:$cdom:st"});
+}
+
 sub quota_admin {
     my ($setquota,$changeHash) = @_;
     my $quotachanged;
@@ -2554,10 +2572,10 @@ sub course_level_table {
 		    $table .= '<td>&nbsp</td>';
                 }
 		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
@@ -2590,10 +2608,10 @@ ENDTIMEENTRY
                      'name="sec_'.$customrole.'" /></td>';
                 }
                 $table .= <<ENDENTRY;
-<td><input type=hidden name="start_$customrole" value='' />
+<td><input type="hidden" name="start_$customrole" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$customrole" value='' />
+<td><input type="hidden" name="end_$customrole" value='' />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDENTRY
@@ -2685,10 +2703,10 @@ sub course_level_dc {
                      '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start" value='' />
+<td><input type="hidden" name="start" value='' />
 <a href=
 "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end" value='' />
+<td><input type="hidden" name="end" value='' />
 <a href=
 "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY