version 1.136, 2014/12/05 12:03:20
|
version 1.138, 2015/03/06 21:56:41
|
Line 103 sub success {
|
Line 103 sub success {
|
if ($destsymb =~ /___/) {
|
if ($destsymb =~ /___/) {
|
# FIXME Need to deal with encrypted symbs and urls as needed.
|
# FIXME Need to deal with encrypted symbs and urls as needed.
|
my ($map,$resid,$desturl)=split(/___/,$destsymb);
|
my ($map,$resid,$desturl)=split(/___/,$destsymb);
|
unless ($desturl=~/^(adm|editupload|public)/) {
|
$desturl = &Apache::lonnet::clutter($desturl);
|
$desturl = &Apache::lonnet::clutter($desturl);
|
|
}
|
|
$desturl = &HTML::Entities::encode($desturl,'"<>&');
|
$desturl = &HTML::Entities::encode($desturl,'"<>&');
|
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
|
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
|
$destination .= 'destinationurl='.$desturl.
|
$destination .= 'destinationurl='.$desturl.
|
Line 309 sub handler {
|
Line 307 sub handler {
|
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
|
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
|
$form{'serverid'});
|
$form{'serverid'});
|
|
|
my %sessiondata;
|
|
if ($form{'iptoken'}) {
|
|
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
|
|
my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
|
|
}
|
|
|
|
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
|
if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') ||
|
($tmpinfo eq 'no_such_host')) {
|
($tmpinfo eq 'no_such_host')) {
|
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
|
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
|
Line 334 sub handler {
|
Line 326 sub handler {
|
return OK;
|
return OK;
|
}
|
}
|
|
|
my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo);
|
my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo);
|
if ($rolestr) {
|
if ($rolestr) {
|
$rolestr = &unescape($rolestr);
|
$rolestr = &unescape($rolestr);
|
}
|
}
|
if ($symbstr) {
|
if ($symbstr) {
|
$symbstr= &unescape($symbstr);
|
$symbstr= &unescape($symbstr);
|
}
|
}
|
|
if ($iptokenstr) {
|
|
$iptokenstr = &unescape($iptokenstr);
|
|
}
|
if ($rolestr =~ /^role=/) {
|
if ($rolestr =~ /^role=/) {
|
(undef,$form{'role'}) = split('=',$rolestr);
|
(undef,$form{'role'}) = split('=',$rolestr);
|
}
|
}
|
if ($symbstr =~ /^symb=/) {
|
if ($symbstr =~ /^symb=/) {
|
(undef,$form{'symb'}) = split('=',$symbstr);
|
(undef,$form{'symb'}) = split('=',$symbstr);
|
}
|
}
|
|
if ($iptokenstr =~ /^iptoken=/) {
|
|
(undef,$form{'iptoken'}) = split('=',$iptokenstr);
|
|
}
|
|
|
my $upass = $ENV{HTTPS} ? join("", @form{qw(upass0 upass1 upass2)})
|
my $upass = $ENV{HTTPS} ? join("", @form{qw(upass0 upass1 upass2)})
|
: decrypt($key, @form{qw(upass0 upass1 upass2)});
|
: decrypt($key, @form{qw(upass0 upass1 upass2)});
|
Line 412 sub handler {
|
Line 410 sub handler {
|
|
|
my $hosthere;
|
my $hosthere;
|
if ($form{'iptoken'}) {
|
if ($form{'iptoken'}) {
|
|
my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
|
|
my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
|
if (($sessiondata{'domain'} eq $form{'udom'}) &&
|
if (($sessiondata{'domain'} eq $form{'udom'}) &&
|
($sessiondata{'username'} eq $form{'uname'})) {
|
($sessiondata{'username'} eq $form{'uname'})) {
|
$hosthere = 1;
|
$hosthere = 1;
|