--- loncom/auth/lonauth.pm 2001/07/25 01:44:53 1.20 +++ loncom/auth/lonauth.pm 2001/10/05 05:21:56 1.25 @@ -6,6 +6,9 @@ # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10, # 05/28,05/29 Gerd Kortemeyer # 07/24 Scott Harrison +# 07/28,08/03 Gerd Kortemeyer +# 8/15 Scott Harrison +# 8/20 Gerd Kortemeyer package Apache::lonauth; @@ -121,10 +124,10 @@ sub success { # ------------------------------------------------- Check for critical messages - my @what=&Apache::lonnet::dump('critical'); + my @what=&Apache::lonnet::dump('critical',$domain,$username); if ($what[0]) { - if ($what[0] ne 'con_lost') { - $lowerurl='/adm/email/critical/'.$what[0]; + if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { + $lowerurl='/adm/email?critical=display'; } } @@ -171,7 +174,7 @@ function wait() { } function main() { - canceltim=setTimeout('tim=1;',20000); + canceltim=setTimeout('tim=1;',80000); checkdef(); wait(); } @@ -256,7 +259,7 @@ sub handler { my $keybin=pack("H16",$key); - my $cipher=new DES $keybin; + my $cipher=new Crypt::DES $keybin; my $upass=$cipher->decrypt( unpack("a8",pack("H16",substr($FORM{'upass'},0,16)))); @@ -279,7 +282,7 @@ sub handler { } if (($firsturl eq '') || ($firsturl eq '/adm/logout')) { - $firsturl='/res/adm/pages/index.html'; + $firsturl='/adm/roles'; } success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);