--- loncom/auth/lonauth.pm	2004/10/28 16:25:19	1.63
+++ loncom/auth/lonauth.pm	2005/06/07 02:14:28	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.63 2004/10/28 16:25:19 albertel Exp $
+# $Id: lonauth.pm,v 1.67 2005/06/07 02:14:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,13 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
-# 16/11,12/16,
-# 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
-# 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
-# 05/28,05/29 Gerd Kortemeyer
-# 07/28,08/03 Gerd Kortemeyer
-# 8/20 Gerd Kortemeyer
 
 package Apache::lonauth;
 
@@ -43,7 +36,7 @@ use CGI::Cookie();
 use DynaLoader; # for Crypt::DES version
 use Crypt::DES;
 use Apache::loncommon();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonmenu();
 use Fcntl qw(:flock);
 use Apache::lonlocal;
@@ -107,7 +100,9 @@ sub success {
     if (($userenv{'interface'}) && (!$FORM{'interface'})) {
 	$FORM{'interface'}=$userenv{'interface'};
     }
-    $ENV{'environment.remote'}=$userenv{'remote'};
+    $env{'environment.remote'}=$userenv{'remote'};
+    if ($userenv{'texengine'} eq 'ttm') { $clientmathml=1; }
+
 # --------------- Do not trust query string to be put directly into environment
     foreach ('imagesuppress','appletsuppress',
 	     'embedsuppress','fontenhance','blackwhite',
@@ -141,12 +136,12 @@ sub success {
 	print $idf "request.course.uri=\n";
 	print $idf "request.course.sec=\n";
 	print $idf "request.role=cm\n";
-        print $idf "request.role.adv=$ENV{'user.adv'}\n";
+        print $idf "request.role.adv=$env{'user.adv'}\n";
 	print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
 	if ($FORM{'interface'}) {
 	    $FORM{'interface'}=~s/\W//gs;
 	    print $idf "browser.interface=$FORM{'interface'}\n";
-	    $ENV{'browser.interface'}=$FORM{'interface'};
+	    $env{'browser.interface'}=$FORM{'interface'};
 	    foreach ('imagesuppress','appletsuppress',
 		     'embedsuppress','fontenhance','blackwhite') {
 		if (($FORM{$_} eq 'true') ||
@@ -158,9 +153,9 @@ sub success {
 	if ($userroles ne '') { print $idf "$userroles"; }
 	$idf->close();
     }
-    $ENV{'request.role'}='cm';
-    $ENV{'request.role.adv'}=$ENV{'user.adv'};
-    $ENV{'browser.type'}=$clientbrowser;
+    $env{'request.role'}='cm';
+    $env{'request.role.adv'}=$env{'user.adv'};
+    $env{'browser.type'}=$clientbrowser;
 # -------------------------------------------------------------------- Log this
 
     &Apache::lonnet::log($domain,$username,$authhost,
@@ -186,6 +181,11 @@ sub success {
     my $maincall=&Apache::lonmenu::maincall();
     my $bodytag=&Apache::loncommon::bodytag('Successful Login');
     my $add=&addcontent();
+    my $continuelink;
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) {
+	$continuelink="<a href=\"$lowerurl\">".&mt('Continue')."</a>";
+    }
 # ------------------------------------------------- Output for successful login
 
     $r->send_cgi_header(<<ENDHEADER);
@@ -213,6 +213,7 @@ $lt{'mes'}.<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}?</a></p>
 $remoteinfo
 $maincall
+$continuelink
 </body>
 </html>
 ENDSUCCESS
@@ -339,7 +340,7 @@ ENDFAILED
        $FORM{$name}=$value;
     } 
 
-    if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {
+    if ((!$FORM{'uname'}) || (!$FORM{'upass0'}) || (!$FORM{'udom'})) {
 	failed($r,'Username, password and domain need to be specified.');
         return OK;
     }
@@ -380,14 +381,17 @@ ENDFAILED
     else {
 	$cipher=new DES $keybin;
     }
+    my $upass='';
+    for (my $i=0;$i<=2;$i++) {
+	my $chunk=
+	    $cipher->decrypt(unpack("a8",pack("H16",substr($FORM{'upass'.$i},0,16))));
 
-    my $upass=$cipher->decrypt(
-       unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
+	$chunk.=
+	    $cipher->decrypt(unpack("a8",pack("H16",substr($FORM{'upass'.$i},16,16))));
 
-    $upass.=$cipher->decrypt(
-       unpack("a8",pack("H16",substr($FORM{'upass'},16,16))));
-
-    $upass=substr($upass,1,ord(substr($upass,0,1)));
+	$chunk=substr($chunk,1,ord(substr($chunk,0,1)));
+	$upass.=$chunk;
+    }
 
 # ---------------------------------------------------------------- Authenticate
     my $authhost=Apache::lonnet::authenticate($FORM{'uname'},