--- loncom/interface/Attic/londropadd.pm	2001/02/14 22:51:48	1.12
+++ loncom/interface/Attic/londropadd.pm	2002/04/04 17:32:45	1.22
@@ -1,12 +1,37 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
+# $Id: londropadd.pm,v 1.22 2002/04/04 17:32:45 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Handler to set parameters for assessments
 #
 # (Handler to resolve ambiguous file locations
 #
 # (TeX Content Handler
 #
+# YEAR=2000
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)
 #
 # 10/11,10/12,10/16 Gerd Kortemeyer)
@@ -15,7 +40,14 @@
 # 12/08,12/12 Gerd Kortemeyer)
 #
 # 12/26,12/27,12/28,
-# 01/01/01,01/15,02/10,02/13,02/14 Gerd Kortemeyer
+# YEAR=2001
+# 01/01/01,01/15,02/10,02/13,02/14,02/22 Gerd Kortemeyer
+# 8/6 Scott Harrison
+# Guy Albertelli
+# 9/25 Gerd Kortemeyer
+# 12/19 Guy Albertelli
+# YEAR=2002
+# 1/4 Gerd Kortemeyer
 
 package Apache::londropadd;
 
@@ -97,22 +129,22 @@ sub record_sep {
     if ($ENV{'form.upfiletype'} eq 'xml') {
     } elsif ($ENV{'form.upfiletype'} eq 'space') {
         my $i=0;
-        map {
+        foreach (split(/\s+/,$record)) {
             my $field=$_;
             $field=~s/^(\"|\')//;
             $field=~s/(\"|\')$//;
             $components{$i}=$field;
             $i++;
-        } split(/\s+/,$record);
+        }
     } elsif ($ENV{'form.upfiletype'} eq 'tab') {
         my $i=0;
-        map {
+        foreach (split(/\t+/,$record)) {
             my $field=$_;
             $field=~s/^(\"|\')//;
             $field=~s/(\"|\')$//;
             $components{$i}=$field;
             $i++;
-        } split(/\t+/,$record);        
+        }
     } else {
         my @allfields=split(/\,/,$record);
         my $i=0;
@@ -141,13 +173,15 @@ sub dropstudent {
      my ($udom,$unam,$courseid,$csec)=@_;
      $courseid=~s/\_/\//g;
      $courseid=~s/^(\w)/\/$1/;
-     map {
+     foreach (split(/\&/,
+		    &Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles',
+			     &Apache::lonnet::homeserver($unam,$udom)))) {
         my ($key,$value)=split(/\=/,$_);
         $key=&Apache::lonnet::unescape($key);
         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
           my $section=$1;
           if ($key eq $courseid.'_st') { $section=''; }
-          if ($section ne $csec) {
+          if (((!$section) && (!$csec)) || ($section ne $csec)) {
 	    my ($dummy,$end,$start)=split(/\_/,
                                     &Apache::lonnet::unescape($value));
             my $now=time;
@@ -165,8 +199,7 @@ sub dropstudent {
             }
 	  }
         }
-    } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles',
-                                 &Apache::lonnet::homeserver($unam,$udom)));
+    }
 }
 
 # ============================================================== Menu Phase One
@@ -220,7 +253,9 @@ sub menu_phase_two_upload {
 <input type=hidden name=upfiletype value=$ENV{'form.upfiletype'}>
 <hr>
 <h3>Identify fields</h3>
-Total number of records found in file: $distotal
+Total number of records found in file: $distotal <hr />
+Enter as many fields as you can. The system will inform you and bring you back
+to this page if the data selected is insufficient to run your class.<hr />
 <script>
 function verify(vf) {
     var founduname=0;
@@ -257,6 +292,10 @@ function verify(vf) {
             return;
         }
     }
+    if (vf.login[2].checked) {
+	foundatype=1;
+	//An argument is not required
+    }
     if (foundatype==0) {
 	alert('You need to set the login type');
         return;
@@ -315,6 +354,7 @@ function flip(vf,tf) {
        vf.login[1].checked=true;
        vf.intpwd.value='';
        vf.krbdom.value='';
+       vf.locarg.value='';
    }
 
 }
@@ -397,32 +437,32 @@ ENDPICK
                 if ($total>=2) {
                    %sthree=&record_sep($records[2]);
 	        }
-                map {
+                foreach (sort keys %sone) {
                    $r->print('<tr><td><select name=f'.$i.
                        ' onChange="flip(this.form,'.$i.');">');
-                   map {
-                      my ($value,$display)=split(/\:/,$_);
-                      $r->print('<option value='.$value.'>'.$display.
-                              '</option>');
-                   } ('none: ','username:Username',
+                   foreach ('none: ','username:Username',
                       'names:Last Name, First Names',
                       'fname:First Name','mname:Middle Names/Initials',
                       'lname:Last Name','gen:Generation',
                       'id:ID/Student Number','sec:Group/Section',
-                      'ipwd:Initial Password');
+                      'ipwd:Initial Password') {
+		      my ($value,$display)=split(/\:/,$_);
+                      $r->print('<option value='.$value.'>'.$display.
+                              '</option>');
+                   }
                    $r->print('</select></td><td>');
-                   if (defined($sone{$i})) { 
-                      $r->print($sone{$i}."</br>\n"); 
+                   if (defined($sone{$_})) { 
+                      $r->print($sone{$_}."</br>\n"); 
                    }
-	           if (defined($stwo{$i})) { 
-                      $r->print($stwo{$i}."</br>\n"); 
+	           if (defined($stwo{$_})) { 
+                      $r->print($stwo{$_}."</br>\n"); 
                    }
-	           if (defined($sthree{$i})) { 
-                      $r->print($sthree{$i}."</br>\n"); 
+	           if (defined($sthree{$_})) { 
+                      $r->print($sthree{$_}."</br>\n"); 
                    }
                    $r->print('</td></tr>');
                    $i++;
-	       } sort keys %sone;
+	       }
 	       $i--;
 	     }
              my $keyfields=join(',',sort keys %sone);
@@ -431,13 +471,22 @@ ENDPICK
 <input type=hidden name=nfields value=$i>
 <input type=hidden name=keyfields value="$keyfields">
 <h3>Login Type</h3>
-Note: this will not take effect if the user already exists<p>
-<input type=radio name=login value=krb onClick="clickkrb(this.form);">
+<p>Note: this will not take effect if the user already exists</p>
+<p>
+<input type=radio name=login value=krb onClick="clickkrb(this.form);" />
 Kerberos authenticated with domain
-<input type=text size=10 name=krbdom onChange="setkrb(this.form);"><p>
-<input type=radio name=login value=int onClick="clickint(this.form);"> 
+<input type=text size=10 name=krbdom onChange="setkrb(this.form);" />
+</p>
+<p>
+<input type=radio name=login value=int onClick="clickint(this.form);" />
 Internally authenticated (with initial password 
-<input type=text size=10 name=intpwd onChange="setint(this.form);">)
+<input type=text size=10 name=intpwd onChange="setint(this.form);" />)
+</p>
+<p>
+<input type=radio name=login value=loc onClick="clickloc(this.form);" />
+Local Authentication with argument
+<input type=text size=10 name=locarg onChange="setloc(this.form);" />
+</p>
 <h3>LON-CAPA Domain for Students</h3>
 LON-CAPA domain: <input type=text size=10 value=$defdom name=lcdomain><p>
 <h3>Starting and Ending Dates</h3>
@@ -456,6 +505,10 @@ LON-CAPA domain: <input type=text size=1
 <h3>Full Update</h3>
 <input type=checkbox name=fullup value=yes> Full update 
 (also print list of users not enrolled anymore)<p>
+<h3>ID/Student Number</h3>
+<input type=checkbox name=forceid value=yes> 
+Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
+(only do if you know what you are doing)<p>
 <input type=button onClick="verify(this.form)" value="Update Courselist"><br>
 Note: for large courses, this operation might be time consuming.
 ENDPICK
@@ -476,7 +529,11 @@ sub enroll_single_student {
         } elsif ($ENV{'form.login'} eq 'int') {
            $amode='internal';
            $genpwd=$ENV{'form.intpwd'};
-        }
+        }  elsif ($ENV{'form.login'} eq 'loc') {
+	    $amode='localauth';
+	    $genpwd=$ENV{'form.locarg'};
+	    if (!$genpwd) { $genpwd=" "; }
+	}
         if (($amode) && ($genpwd)) {
  	  &dropstudent($ENV{'form.cdomain'},$ENV{'form.cuname'},
 		       $ENV{'request.course.id'},$ENV{'form.csec'});
@@ -486,7 +543,7 @@ sub enroll_single_student {
  	              $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
                       $ENV{'form.clast'},$ENV{'form.cgen'},
                       $ENV{'form.csec'},$ENV{'form.enddate'},
-                      $ENV{'form.startdate'}));
+                      $ENV{'form.startdate'},$ENV{'form.forceid'}));
 	} else {
            $r->print('Invalid login mode or password');    
         }          
@@ -520,18 +577,18 @@ function verify(vf) {
     var foundatype=0;
     var tw;
     var message='';
-    if ((vf.cuname.value!=undefined) && (vf.cuname.value!='') && 
-	(vf.cdomain.value!=undefined) && (vf.cdomain.value!='')) {
+    if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') && 
+	(typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) {
         founduname=1;
     }
-    if ((vf.cfirst.value!=undefined) && (vf.cfirst.value!='') &&
-	(vf.clast.value!=undefined) && (vf.clast.value!='')) {
+    if ((typeof(vf.cfirst.value)!="undefined") && (vf.cfirst.value!='') &&
+	(typeof(vf.clast.value)!="undefined") && (vf.clast.value!='')) {
         foundname=1;
     }
-    if ((vf.csec.value!=undefined) && (vf.csec.value!='')) {
+    if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
         foundsec=1;
     }
-    if ((vf.cstid.value!=undefined) && (vf.cstid.value!='')) {
+    if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
 	foundid=1;
     }
     if (founduname==0) {
@@ -552,6 +609,10 @@ function verify(vf) {
             return;
         }
     }
+    if (vf.login[2].checked) {
+	foundatype=1;
+	//An argument is not required
+    }
     if (foundatype==0) {
 	alert('You need to set the login type');
         return;
@@ -588,6 +649,7 @@ function setkrb(vf) {
        vf.login[0].checked=true;
        vf.krbdom.value=vf.krbdom.value.toUpperCase();
        vf.intpwd.value='';
+       vf.locarg.value='';
    }
 }
 
@@ -595,16 +657,32 @@ function setint(vf) {
     if (vf.intpwd.value!='') {
        vf.login[1].checked=true;
        vf.krbdom.value='';
+       vf.locarg.value='';
+   }
+}
+
+function setloc(vf) {
+    if (vf.locarg.value!='') {
+       vf.login[2].checked=true;
+       vf.krbdom.value='';
+       vf.intpwd.value='';
    }
 }
 
 function clickkrb(vf) {
     vf.krbdom.value='$krbdefdom';
     vf.intpwd.value='';
+    vf.locarg.value='';
 }
 
 function clickint(vf) {
     vf.krbdom.value='';
+    vf.locarg.value='';
+}
+
+function clickloc(vf) {
+    vf.krbdom.value='';
+    vf.intpwd.value='';
 }
 
     function pclose() {
@@ -656,7 +734,11 @@ Kerberos authenticated with domain
 <input type=radio name=login value=int onClick="clickint(this.form);"> 
 Internally authenticated (with initial password 
 <input type=text size=10 name=intpwd onChange="setint(this.form);">)
-
+<p>
+<input type=radio name=login value=loc onClick="clickloc(this.form);" />
+Local Authentication with argument
+<input type=text size=10 name=locarg onChange="setloc(this.form);" />
+</p>
 <h3>Starting and Ending Dates</h3>
 <input type="hidden" value='' name="pres_value">
 <input type="hidden" value='' name="pres_type">
@@ -670,6 +752,10 @@ Internally authenticated (with initial p
 <a 
  href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
 >Set Ending Date</a><p>
+<h3>ID/Student Number</h3>
+<input type=checkbox name=forceid value=yes> 
+Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
+(only do if you know what you are doing)<p>
 <input type=button onClick="verify(this.form)" value="Enroll as student"><br>
 <input type=hidden name=phase value=five>
 ENDSENROLL
@@ -687,7 +773,7 @@ sub menu_phase_two_drop {
                  my %currentlist=();
                  my $now=time;
                  unless ($classlst=~/^error\:/) {
-                     map {
+                     foreach (split(/\&/,$classlst)) {
                         my ($name,$value)=split(/\=/,$_);
                         my ($end,$start)=split(/\:/,
                                             &Apache::lonnet::unescape($value));
@@ -696,7 +782,7 @@ sub menu_phase_two_drop {
                         if ($active) {
 		           $currentlist{&Apache::lonnet::unescape($name)}=1;
                         }
-                     } split(/\&/,$classlst);
+                     }
 # ----------------------------------------------------------- Print out choices
                      &show_drop_list($r,%currentlist);
 	         } else {
@@ -714,7 +800,7 @@ sub show_drop_list {
 
     $r->print('<input type=hidden name=phase value=four>');
                      $r->print('<table border=2>');
-                     map {
+                     foreach (sort keys %currentlist) {
                          my ($sname,$sdom)=split(/\:/,$_);
                          my %reply=&Apache::lonnet::idrget($sdom,$sname);
                          my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
@@ -732,7 +818,7 @@ sub show_drop_list {
                                    &Apache::lonnet::unescape($reply[1]).
                                    '</td><td>'.
                                    $ssec."</td></tr>\n");
-                     } sort keys %currentlist;
+                     }
                      $r->print('</table><br>');
                      $r->print('<input type=submit value="Drop Students">');
 }
@@ -767,7 +853,12 @@ sub upfile_drop_add {
                  if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) {
 		     $genpwd=$ENV{'form.intpwd'};
                  }
-             }
+             } elsif ($ENV{'form.login'} eq 'loc') {
+		 $amode='localauth';
+		 if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
+		     $genpwd=$ENV{'form.locarg'};
+                 }
+	     }
              unless (($domain=~/\W/) || ($amode eq '')) {
               $r->print('<h3>Enrolling Students</h3>');
               my $count=0;
@@ -775,7 +866,7 @@ sub upfile_drop_add {
               my %student=();
 # ----------------------------------------------------------- Get new classlist
 # --------------------------------------------------------- Enroll new students
-	      map {
+	      foreach (@studentdata) {
 		  my %entries=&record_sep($_);
 
                 unless (($entries{$fields{'username'}} eq '') ||
@@ -831,7 +922,8 @@ sub upfile_drop_add {
 			 &dropstudent($domain,$username,$cid,$sec);
                          my $reply=&Apache::lonnet::modifystudent(
                           $domain,$username,$id,$amode,$password,
-			   $fname,$mname,$lname,$gen,$sec,$enddate,$startdate);
+			   $fname,$mname,$lname,$gen,$sec,$enddate,$startdate,
+                           $ENV{'form.forceid'});
                          unless ($reply eq 'ok') {
                             $r->print(
                              "<p><b>Error enrolling $username: $reply</b><p>");
@@ -850,7 +942,7 @@ sub upfile_drop_add {
                      }
                   }
                  }                 
-              } @studentdata;
+              }
               $r->print('<p>Processed Students: '.$count);
 # --------------------------------------------------------------- Drop students
               if ($ENV{'form.fullup'} eq 'yes') {
@@ -863,7 +955,7 @@ sub upfile_drop_add {
                  my %currentlist=();
                  my $now=time;
                  unless ($classlst=~/^error\:/) {
-                     map {
+                     foreach (split(/\&/,$classlst)) {
                         my ($name,$value)=split(/\=/,$_);
                         my ($end,$start)=split(/\:/,
                                             &Apache::lonnet::unescape($value));
@@ -872,9 +964,9 @@ sub upfile_drop_add {
                         if ($active) {
 		           $currentlist{&Apache::lonnet::unescape($name)}=1;
                         }
-                     } split(/\&/,$classlst);
+                     }
 # ------------------------------------------------ Now got up-to-date classlist
-                     map {
+                     foreach (@studentdata) {
  	                my %entries=&record_sep($_);
                         unless (($entries{$fields{'username'}} eq '') ||
                           (!defined($entries{$fields{'username'}}))) {
@@ -882,7 +974,7 @@ sub upfile_drop_add {
                             $entries{$fields{'username'}}.':'.
                             $domain});
 		        }
-                     } @studentdata;
+                     }
 # ----------------------------------------------------------- Print out choices
                      &show_drop_list($r,%currentlist);
 	         } else {
@@ -901,14 +993,14 @@ sub upfile_drop_add {
 sub drop_student_list {
     my $r=shift;
     my $count=0;
-    map {
+    foreach (keys %ENV) {
 	if ($_=~/^form\.drop\:/) {
 	    my ($dummy,$uname,$udom)=split(/\:/,$_);
             &dropstudent($udom,$uname,$ENV{'request.course.id'});
             $r->print('Dropped '.$uname.' at '.$udom.'<br>');
             $count++;
         }
-    } keys %ENV;
+    }
     $r->print('<p><b>Dropped '.$count.' student(s).</b>');
     $r->print('<p>Re-enrollment will re-activate data.');
 }