--- loncom/interface/Attic/londropadd.pm	2007/10/11 02:16:25	1.172
+++ loncom/interface/Attic/londropadd.pm	2007/10/22 22:16:38	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.172 2007/10/11 02:16:25 albertel Exp $
+# $Id: londropadd.pm,v 1.173 2007/10/22 22:16:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -423,7 +423,7 @@ END
 }
 END
     } else {
-        $section_checks = &section_check_js();
+        $section_checks = &Apache::lonuserutils::section_check_js();
         $optional_checks = (<<END);
     var message='';
     if (foundname==0) { 
@@ -759,9 +759,10 @@ sub enroll_single_student {
     # in the course is entirely separate from the action of enrolling the
     # student.  Also, a failure in setting the dates as default is not fatal
     # to the process of enrolling / modifying a student.
-    my ($startdate,$enddate) = &get_dates_from_form();
+    my ($startdate,$enddate) = &Apache::lonuserutils::get_dates_from_form();
     if ($env{'form.makedatesdefault'}) {
-        $r->print(&make_dates_default($startdate,$enddate));
+        $r->print(&Apache::lonuserutils::make_dates_default($startdate,
+                                                            $enddate));
     }
 
     $r->print('<h3>'.&mt('Enrolling Student').'</h3>');
@@ -806,7 +807,7 @@ sub enroll_single_student {
                                                    $env{'form.lcdomain'});
         if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
             # Clean out any old roles the student has in this class.
-            &modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
+            &Apache::lonuserutils::modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
                            $env{'request.course.id'},$env{'form.csec'},
                             $desiredhost);
             my $login_result = &Apache::lonnet::modifystudent
@@ -1066,7 +1067,8 @@ sub print_enroll_single_student_form {
         my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($ccdomain);
         $javascript_validations = 
-            &javascript_validations('auth',$krbdefdom,undef,undef,$ccdomain);
+            &Apache::lonuserutils::javascript_validations('auth',$krbdefdom,
+                                                      undef,undef,$ccdomain);
         my %param = ( formname => 'document.studentform',
                       kerb_def_dom => $krbdefdom,
                       kerb_def_auth => $krbdef
@@ -1132,7 +1134,7 @@ END
     } else {
         # User already exists.  Do not worry about authentication
         my %uenv = &Apache::lonnet::dump('environment',$ccdomain,$ccuname);
-        $javascript_validations = &javascript_validations('noauth');
+        $javascript_validations = &Apache::lonuserutils::javascript_validations('noauth');
 	my %lt=&Apache::lonlocal::texthash(
 		       'udf'  => "User Data for",
                        'fn'   => "First Name",
@@ -1158,7 +1160,7 @@ END
 </table>
 END
     }
-    my $date_table = &date_setting_table();
+    my $date_table = &Apache::lonuserutils::date_setting_table();
         # Print it all out
     my %lt=&Apache::lonlocal::texthash(
 		   'cd'   => "Course Data",
@@ -1807,7 +1809,8 @@ sub print_modify_student_form {
                 &Apache::lonlocal::locallocaltime($endtime)).'<br />';
 
     }
-    my $date_table = &date_setting_table($starttime,$endtime);
+    my $date_table = 
+        &Apache::lonuserutils::date_setting_table($starttime,$endtime);
     #
     if (! exists($env{'form.Status'}) || 
         $env{'form.Status'} !~ /^(Any|Expired|Active|Future)$/) {
@@ -1829,7 +1832,7 @@ sub print_modify_student_form {
                    'sm'    => "Submit Modifications",
 				       );
 # Check if section name is valid
-    my $section_check = &section_check_js();
+    my $section_check = &Apache::lonuserutils::section_check_js();
     $r->print(<<"END");
 <script type="text/javascript">
 $section_check
@@ -1894,9 +1897,10 @@ sub modify_single_student {
     $env{'form.section'} =~ s/\W//g;
     #
     # Do the date defaults first
-    my ($starttime,$endtime) = &get_dates_from_form();
+    my ($starttime,$endtime) = &Apache::lonuserutils::get_dates_from_form();
     if ($env{'form.makedatesdefault'}) {
-        $r->print(&make_dates_default($starttime,$endtime));
+        $r->print(&Apache::lonuserutils::make_dates_default($starttime,
+                                                            $endtime));
     }
     # Get the 'sortby' and 'Status' variables so the user goes back to their
     # previous screen
@@ -2042,9 +2046,10 @@ END
     #
     # Send request(s) to modify data (final undef is for 'desiredhost',
     # which is a moot point because the student already has an account.
-    my $modify_section_results = &modifystudent($sdom,$slogin,
-                                                $env{'request.course.id'},
-                                                $section,undef);
+    my $modify_section_results = 
+        &Apache::lonuserutils::modifystudent($sdom,$slogin,
+                                             $env{'request.course.id'},
+                                             $section,undef);
     if ($modify_section_results !~ /^ok/) {
         $r->print(&mt('An error occured during the attempt to change the section for this student.')."<br />");
     }
@@ -2504,8 +2509,9 @@ sub upfile_drop_add {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
                     if ($password || $env{'form.login'} eq 'loc') {
-                        &modifystudent($domain,$username,$cid,$sec,
-                                       $desiredhost);
+                        &Apache::lonuserutils::modifystudent($domain,
+                                                         $username,$cid,
+                                                         $sec,$desiredhost);
                         my $reply=&Apache::lonnet::modifystudent
                             ($domain,$username,$id,$amode,$password,
                              $fname,$mname,$lname,$gen,$sec,$enddate,
@@ -2572,7 +2578,8 @@ sub drop_student_list {
     foreach (@droplist) {
         my ($uname,$udom)=split(/\:/,$_);
         # drop student
-        my $result = &modifystudent($udom,$uname,$env{'request.course.id'});
+        my $result = &Apache::lonuserutils::modifystudent($udom,$uname,
+                                                $env{'request.course.id'});
         if ($result eq 'ok' || $result eq 'ok:') {
             $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
             $count++;