--- loncom/interface/Attic/londropadd.pm 2006/07/19 12:26:06 1.145
+++ loncom/interface/Attic/londropadd.pm 2006/12/21 19:41:03 1.152
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.145 2006/07/19 12:26:06 albertel Exp $
+# $Id: londropadd.pm,v 1.152 2006/12/21 19:41:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,7 @@ use Spreadsheet::WriteExcel;
use Apache::lonstathelpers();
use Apache::lonlocal;
use Apache::longroup;
+use LONCAPA();
###############################################################
###############################################################
@@ -60,8 +61,8 @@ sub modifystudent {
# if $csec is undefined, drop the student from all the courses matching
# this one. If $csec is defined, drop them from all other sections of
# this course and add them to section $csec
- $courseid=~s/\_/\//g;
- $courseid=~s/^(\w)/\/$1/;
+ my $cdom = $env{'course.'.$courseid.'.domain'};
+ my $cnum = $env{'course.'.$courseid.'.num'};
my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
@@ -69,10 +70,10 @@ sub modifystudent {
# Go through the roles looking for enrollment in this course
my $result = '';
foreach my $course (keys(%roles)) {
- if ($course=~/^$courseid(?:\/)*(?:\s+)*(\w+)*\_st$/) {
+ if ($course=~m{^/\Q$cdom\E/\Q$cnum\E(?:\/)*(?:\s+)*(\w+)*\_st$}) {
# We are in this course
my $section=$1;
- $section='' if ($course eq $courseid.'_st');
+ $section='' if ($course eq "/$cdom/$cnum".'_st');
if (defined($csec) && $section eq $csec) {
$result .= 'ok:';
} elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) {
@@ -135,7 +136,9 @@ sub print_main_menu {
my ($r,$enrl_permission,$view_permission,$grp_manage_permission,
$grp_view_permission)=@_;
#
- my ($cdom,$cnum) = split/_/,$env{'request.course.id'};
+ my $cid =$env{'request.course.id'};
+ my $cdom=$env{'course.'.$cid.'.domain'};
+ my $cnum=$env{'course.'.$cid.'.num'};
my @menu =
(
{ text => 'Upload a class list',
@@ -177,11 +180,11 @@ sub print_main_menu {
permission => $grp_manage_permission,
url => '/adm/coursegroups?refpage=enrl&action=modify',
},
- { text => 'Delete an existing group',
- help => 'Course_Delete_Group',
- permission => $grp_manage_permission,
- url => '/adm/coursegroups?refpage=enrl&action=delete',
- },
+# { text => 'Delete an existing group',
+# help => 'Course_Delete_Group',
+# permission => $grp_manage_permission,
+# url => '/adm/coursegroups?refpage=enrl&action=delete',
+# },
{ text => 'Enter an existing group',
help => 'Course_Display_Group',
permission => $grp_view_permission,
@@ -250,7 +253,7 @@ sub print_upload_manager_header {
#
my $javascript_validations=&javascript_validations('auth',$krbdefdom,
$password_choice);
- my $checked=(($env{'form.noFirstLine'})?' checked="1"':'');
+ my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
$r->print('<h3>'.&mt('Uploading Class List')."</h3>\n".
"<hr>\n".
'<h3>'.&mt('Identify fields')."</h3>\n");
@@ -269,7 +272,7 @@ sub print_upload_manager_header {
$r->print('<input type="button" value="Reverse Association" '.
'name="'.&mt('Reverse Association').'" '.
'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
- $r->print('<label><input type="checkbox" name="noFirstLine" $checked />'.
+ $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
&mt('Ignore First Line').'</label>');
$r->print("<hr />\n".
'<script type="text/javascript" language="Javascript">'."\n".
@@ -746,8 +749,12 @@ sub enroll_single_student {
$r->print('<h3>'.&mt('Enrolling Student').'</h3>');
$r->print('<p>'.&mt('Enrolling').' '.$env{'form.cuname'}." \@ ".
$env{'form.lcdomain'}.'</p>');
- if (($env{'form.cuname'})&&($env{'form.cuname'}!~/\W/)&&
- ($env{'form.lcdomain'})&&($env{'form.lcdomain'}!~/\W/)) {
+ if (($env{'form.cuname'})
+ && ($env{'form.cuname'}
+ eq &LONCAPA::clean_username($env{'form.cuname'}))
+ && ($env{'form.lcdomain'})
+ && ($env{'form.lcdomain'}
+ eq &LONCAPA::clean_domain($env{'form.lcdomain'}))) {
# Deal with home server selection
my $domain=$env{'form.lcdomain'};
my $desiredhost = $env{'form.lcserver'};
@@ -957,10 +964,8 @@ sub print_enroll_single_student_form {
my $r=shift;
$r->print("<h3>".&mt('Enroll One Student')."</h3>");
#
- my $username = $env{'form.cuname'};
- my $domain = $env{'form.cudomain'};
- $username=~s/\W//gs;
- $domain=~s/\W//gs;
+ my $username = &LONCAPA::clean_username($env{'form.cuname'});
+ my $domain = &LONCAPA::clean_domain($env{'form.cudomain'});
my $home = &Apache::lonnet::homeserver($username,$domain);
# $new_user flags whether we are creating a new user or using an old one
my $new_user = 1;
@@ -1172,12 +1177,12 @@ sub print_html_classlist {
if (! exists($env{'form.sortby'})) {
$env{'form.sortby'} = 'username';
}
- if ($env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ if ($env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
$env{'form.Status'} = 'Active';
}
my $status_select = &Apache::lonhtmlcommon::StatusOptions
($env{'form.Status'});
- my $cid=$env{'request.course.id'};
+ my $cid =$env{'request.course.id'};
my $cdom=$env{'course.'.$cid.'.domain'};
my $cnum=$env{'course.'.$cid.'.num'};
#
@@ -1383,6 +1388,9 @@ END
if($statusmode eq 'Expired') {
print $CSVfile '"'.&mt('Students with expired roles').'"'."\n";
}
+ if($statusmode eq 'Future') {
+ print $CSVfile '"'.&mt('Students with future roles').'"'."\n";
+ }
if ($statusmode eq 'Any') {
print $CSVfile '"'.join('","',map {
&Apache::loncommon::csv_translate(&mt($_))
@@ -1642,7 +1650,7 @@ sub print_modify_student_form {
my $date_table = &date_setting_table($starttime,$endtime);
#
if (! exists($env{'form.Status'}) ||
- $env{'form.Status'} !~ /^(Any|Expired|Active)$/) {
+ $env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
$env{'form.Status'} = 'crap';
}
# Make sure student is enrolled in course
@@ -1867,7 +1875,8 @@ END
sub get_enrollment_data {
my ($sname,$sdomain) = @_;
my $courseid = $env{'request.course.id'};
- $courseid =~ s:_:/:g;
+ my $cdom = $env{'course.'.$courseid.'.domain'};
+ my $cnum = $env{'course.'.$courseid.'.num'};
my %roles = &Apache::lonnet::dump('roles',$sdomain,$sname);
my ($tmp) = keys(%roles);
# Bail out if we were unable to get the students roles
@@ -1877,7 +1886,7 @@ sub get_enrollment_data {
my $section = '';
my $count = scalar(keys(%roles));
while (my ($course,$role) = each(%roles)) {
- if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) {
+ if ($course=~m{^/\Q$cdom\E/\Q$cnum\E/*\s*(\w+)*_st$} ) {
#
# Get active role
$section=$1;
@@ -2190,7 +2199,8 @@ sub upfile_drop_add {
$amode = ''; # This causes the loop below to be skipped
}
}
- unless (($domain=~/\W/) || ($amode eq '')) {
+ if ( $domain eq &clean_domain($domain)
+ && ($amode ne '')) {
#######################################
## Enroll Students ##
#######################################
@@ -2224,7 +2234,8 @@ sub upfile_drop_add {
$gen=$entries{$fields{'gen'}};
}
}
- if ($entries{$fields{'username'}}=~/\W/) {
+ if ($entries{$fields{'username'}}
+ ne &LONCAPA::clean_username($entries{$fields{'username'}})) {
$r->print('<br />'.
&mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
$entries{$fields{'username'}},$fname,$mname,$lname,$gen).