--- loncom/auth/lonauth.pm 2021/12/12 01:48:40 1.121.2.22 +++ loncom/auth/lonauth.pm 2021/12/16 21:48:19 1.121.2.23 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.121.2.22 2021/12/12 01:48:40 raeburn Exp $ +# $Id: lonauth.pm,v 1.121.2.23 2021/12/16 21:48:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -250,13 +250,6 @@ sub failed { my $firsturl = &Apache::loncommon::cleanup_html($form->{firsturl}); if ($firsturl ne '') { $retry .= (($retry=~/\?/)?'&':'?').'firsturl='.$firsturl; - if ($form->{firsturl} =~ m{^/tiny/$match_domain/\w+$}) { - unless (exists($form->{linkprot})) { - if (exists($form->{linkkey})) { - $retry .= 'linkkey='.$form->{linkkey}; - } - } - } } } } elsif ($querystr ne '') { @@ -329,7 +322,7 @@ sub handler { $form{'serverid'}); unless (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || ($tmpinfo eq 'no_such_host')) { - my ($des_key,$firsturl,@rest)=split(/&/,$tmpinfo)l + my ($des_key,$firsturl,@rest)=split(/&/,$tmpinfo); $firsturl = &unescape($firsturl); my %info; foreach my $item (@rest) { @@ -406,7 +399,7 @@ sub handler { my ($key,$value) = split(/=/,$item); $form{$key} = &unescape($value); } - my $upass = &Apache::loncommon::des_decrypt($key,$form{'upass0'}); + my $upass = &Apache::loncommon::des_decrypt($des_key,$form{'upass0'}); # ---------------------------------------------------------------- Authenticate @@ -468,9 +461,9 @@ sub handler { $firsturl='/adm/roles'; } - my $hosthere; + my ($hosthere,%sessiondata); if ($form{'iptoken'}) { - my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); + %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'}); my $delete = &Apache::lonnet::tmpdel($form{'iptoken'}); if (($sessiondata{'domain'} eq $form{'udom'}) && ($sessiondata{'username'} eq $form{'uname'})) {