--- loncom/interface/Attic/londropadd.pm	2006/11/23 03:17:17	1.150
+++ loncom/interface/Attic/londropadd.pm	2007/03/03 01:33:21	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.150 2006/11/23 03:17:17 albertel Exp $
+# $Id: londropadd.pm,v 1.156 2007/03/03 01:33:21 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
-    my $cdom = $env{'request.'.$courseid.'.domain'};
-    my $cnum = $env{'request.'.$courseid.'.num'};
+    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
@@ -105,7 +106,7 @@ sub domain_form {
     # Set up domain and server selection forms
     #
     # Get the domains
-    my @domains = &Apache::loncommon::get_domains();
+    my @domains = &Apache::lonnet::all_domains();
     # build up the menu information to be passed to 
     # &Apache::loncommon::linked_select_forms
     my %select_menus;
@@ -179,11 +180,16 @@ 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 => 'Re-enable a deleted group',
+            help => 'Course_Reenable_Group',
+            permission => $grp_manage_permission,
+            url => '/adm/coursegroups?refpage=enrl&action=reenable',
+            },
           { text => 'Enter an existing group',
             help => 'Course_Display_Group',
             permission => $grp_view_permission,
@@ -816,6 +822,7 @@ sub enroll_single_student {
     } else {
         $r->print(&mt('Invalid username or domain'));
     }    
+    $r->print("<p><a href='/adm/dropadd?action=enrollstudent'>".&mt("Enroll another student")."</a></p>");
 }
 
 sub setup_date_selectors {
@@ -1874,8 +1881,8 @@ END
 sub get_enrollment_data {
     my ($sname,$sdomain) = @_;
     my $courseid = $env{'request.course.id'};
-    my $cdom = $env{'request.'.$courseid.'.domain'};
-    my $cnum = $env{'request.'.$courseid.'.num'};
+    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
@@ -2198,7 +2205,7 @@ sub upfile_drop_add {
             $amode = ''; # This causes the loop below to be skipped
         }
     }
-    if ( $domain eq &clean_domain($domain)
+    if ( $domain eq &LONCAPA::clean_domain($domain)
 	&& ($amode ne '')) {
         #######################################
         ##         Enroll Students           ##