--- loncom/interface/loncreateuser.pm	2001/11/16 06:23:11	1.20
+++ loncom/interface/loncreateuser.pm	2002/01/06 01:29:52	1.23
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
+# $Id: loncreateuser.pm,v 1.23 2002/01/06 01:29:52 harris41 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/
+#
 # (Create a course
 # (My Desk
 #
@@ -22,7 +46,7 @@
 # 05/10,10/16 Gerd Kortemeyer 
 # 11/12,11/13,11/15 Scott Harrison
 #
-# $Id: loncreateuser.pm,v 1.20 2001/11/16 06:23:11 harris41 Exp $
+# $Id: loncreateuser.pm,v 1.23 2002/01/06 01:29:52 harris41 Exp $
 ###
 
 package Apache::loncreateuser;
@@ -39,7 +63,7 @@ my $authformint;
 my $authformfsys;
 my $authformloc;
 
-sub BEGIN {
+BEGIN {
     $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
     my $krbdefdom=$1;
     $krbdefdom=~tr/a-z/A-Z/;
@@ -346,21 +370,19 @@ ENDNUSER
 	    $loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/;
 	}
 	# minor script hack here
-	$loginscript=~s/login\[3\]/login\[4\]/;
-	$loginscript=~s/login\[2\]/login\[3\]/;
-	$loginscript=~s/login\[1\]/login\[2\]/;
-	$loginscript=~s/login\[0\]/login\[1\]/;
+#	$loginscript=~s/login\[3\]/login\[4\]/; # loc
+#	$loginscript=~s/login\[2\]/login\[3\]/; # fsys
+#	$loginscript=~s/login\[1\]/login\[2\]/; # int
+#	$loginscript=~s/login\[0\]/login\[1\]/; # krb4
 
-	$r->print(<<END);
-<hr />
-$loginscript
-END
         unless ($currentauth=~/^krb4:/ or
 		$currentauth=~/^unix:/ or
 		$currentauth=~/^internal:/ or
 		$currentauth=~/^localauth:/
 		) {
 	    $r->print(<<END);
+<hr />
+$loginscript
 <font color='#ff0000'>ERROR:</font>
 This user has an unrecognized authentication scheme ($currentauth).
 Please specify login data below.
@@ -378,18 +400,39 @@ END
 	    if ($currentauth=~/^krb4:/) {
 		$authformcurrent=$authformkrb;
 		$authformother=$authformint.$authformfsys.$authformloc;
+		# embarrassing script hack here
+		$loginscript=~s/login\[3\]/login\[4\]/; # loc
+		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
+		$loginscript=~s/login\[1\]/login\[2\]/; # int
+		$loginscript=~s/login\[0\]/login\[1\]/; # krb4
 	    }
 	    elsif ($currentauth=~/^internal:/) {
 		$authformcurrent=$authformint;
 		$authformother=$authformkrb.$authformfsys.$authformloc;
+		# embarrassing script hack here
+		$loginscript=~s/login\[3\]/login\[4\]/; # loc
+		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
+		$loginscript=~s/login\[1\]/login\[1\]/; # int
+		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
 	    }
 	    elsif ($currentauth=~/^unix:/) {
 		$authformcurrent=$authformfsys;
 		$authformother=$authformkrb.$authformint.$authformloc;
+		# embarrassing script hack here
+		$loginscript=~s/login\[3\]/login\[4\]/; # loc
+		$loginscript=~s/login\[1\]/login\[3\]/; # int
+		$loginscript=~s/login\[2\]/login\[1\]/; # fsys
+		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
 	    }
 	    elsif ($currentauth=~/^localauth:/) {
 		$authformcurrent=$authformloc;
 		$authformother=$authformkrb.$authformint.$authformfsys;
+		# embarrassing script hack here
+		$loginscript=~s/login\[3\]/login\[loc\]/; # loc
+		$loginscript=~s/login\[2\]/login\[4\]/; # fsys
+		$loginscript=~s/login\[1\]/login\[3\]/; # int
+		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
+		$loginscript=~s/login\[loc\]/login\[1\]/; # loc
 	    }
 	    $authformcurrent=<<END;
 <table border='1'>
@@ -402,6 +445,8 @@ END
 </table>
 END
 		$r->print(<<END);
+<hr />
+$loginscript
 <h3>Change Current Login Data</h3>
 $generalrule
 $authformnop
@@ -583,7 +628,7 @@ ENDTHREEHEAD
 	    $r->print('Modifying authentication: '.
 		 &Apache::lonnet::modifyuserauth(
 		       $ENV{'form.cdomain'},$ENV{'form.cuname'},
-                       $amode,$genpwd);
+                       $amode,$genpwd));
             $r->print('<br>Home server: '.&Apache::lonnet::homeserver
                       ($ENV{'form.cuname'},$ENV{'form.cdomain'}));