--- loncom/auth/lonauth.pm	2000/06/05 20:28:17	1.7
+++ loncom/auth/lonauth.pm	2000/07/14 07:43:15	1.10
@@ -2,7 +2,8 @@
 # User Authentication Module
 # 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 Gerd Kortemeyer
+# 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 Gerd Kortemeyer
 
 package Apache::lonauth;
 
@@ -10,6 +11,7 @@ use Apache::Constants qw(:common);
 use Apache::File;
 use CGI qw(:standard);
 use CGI::Cookie();
+use Crypt::DES;
 use Apache::lonnet();
 
 # ------------------------------------------------------------ Successful login
@@ -61,7 +63,7 @@ sub success {
     if ($httpbrowser=~/next/i) { $clientos='next'; }
     if (($httpbrowser=~/mac/i) ||
         ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
-    if ($httpbrowser=~/win/) { $clientos='win'; }
+    if ($httpbrowser=~/win/i) { $clientos='win'; }
 
 # --------------------------------------------------------- Write first profile
 
@@ -158,9 +160,33 @@ sub handler {
     my $domain = $r->dir_config('lonDefDomain');
     my $prodir = $r->dir_config('lonUsersDir');
 
+# ---------------------------------------- Get the information from login token
+
+    my $tmpinfo=Apache::lonnet::reply('tmpget:'.$FORM{'logtoken'},
+                                      $FORM{'serverid'});
+
+    if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
+	failed($r,'Login token missing, inaccessible or expired');
+        return OK;
+    }
+    
+    my ($key,$firsturl)=split(/&/,$tmpinfo);
+
+    my $keybin=pack("H16",$key);
+
+    my $cipher=new DES $keybin;
+
+    my $upass=$cipher->decrypt(
+       unpack("a8",pack("H16",substr($FORM{'upass'},0,16))));
+
+    $upass.=$cipher->decrypt(
+       unpack("a8",pack("H16",substr($FORM{'upass'},16,16))));
+
+    $upass=substr($upass,1,ord(substr($upass,0,1)));
+
 # ---------------------------------------------------------------- Authenticate
     my $authhost=Apache::lonnet::authenticate($FORM{'uname'},
-                                              $FORM{'upass'},
+                                              $upass,
                                               $FORM{'udom'});
     
 # --------------------------------------------------------------------- Failed?
@@ -170,11 +196,11 @@ sub handler {
         return OK;
     }
 
-    if ($FORM{'firsturl'} eq '') {
-	$FORM{'firsturl'}='/res/index.html';
+    if ($firsturl eq '') {
+	$firsturl='/res/adm/pages/index.html';
     }
 
-    success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$FORM{'firsturl'});
+    success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
     return OK;
 }