--- loncom/interface/Attic/londropadd.pm 2006/04/22 01:06:48 1.139
+++ 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.139 2006/04/22 01:06:48 albertel Exp $
+# $Id: londropadd.pm,v 1.152 2006/12/21 19:41:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +39,8 @@ use Apache::Constants qw(:common :http R
use Spreadsheet::WriteExcel;
use Apache::lonstathelpers();
use Apache::lonlocal;
+use Apache::longroup;
+use LONCAPA();
###############################################################
###############################################################
@@ -59,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
@@ -68,16 +70,16 @@ 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) ) {
my (undef,$end,$start)=split(/\_/,$roles{$course});
my $now=time;
- # if this is an active role
+ # if this is an active role
if (!($start && ($now<$start)) || !($end && ($now>$end))) {
my $reply=&Apache::lonnet::modifystudent
# dom name id mode pass f m l g
@@ -134,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',
@@ -176,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,
@@ -249,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('