version 1.203, 2022/08/30 12:25:03
|
version 1.205, 2023/02/03 23:09:30
|
Line 50 sub handler {
|
Line 50 sub handler {
|
$ENV{'REDIRECT_QUERY_STRING'}),
|
$ENV{'REDIRECT_QUERY_STRING'}),
|
['interface','username','domain','firsturl','localpath','localres',
|
['interface','username','domain','firsturl','localpath','localres',
|
'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
|
'token','role','symb','iptoken','btoken','ltoken','ttoken','linkkey',
|
'saml','sso','retry']);
|
'saml','sso','retry','display']);
|
|
|
# -- check if they are a migrating user
|
# -- check if they are a migrating user
|
if (defined($env{'form.token'})) {
|
if (defined($env{'form.token'})) {
|
Line 175 sub handler {
|
Line 175 sub handler {
|
if ($env{'form.symb'}) {
|
if ($env{'form.symb'}) {
|
$info{'symb'} = $env{'form.symb'};
|
$info{'symb'} = $env{'form.symb'};
|
}
|
}
|
|
if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'} ne '')) {
|
|
if ($env{'form.sso'}) {
|
|
if ($env{'form.mailrecip'}) {
|
|
$info{'display'} = &escape($env{'form.display'});
|
|
$info{'mailrecip'} = &escape($env{'form.mailrecip'});
|
|
}
|
|
} else {
|
|
if (($env{'form.username'}) && ($env{'form.domain'})) {
|
|
$info{'display'} = &escape($env{'form.display'});
|
|
$info{'mailrecip'} = &escape($env{'form.username'}.':'.$env{'form.domain'});
|
|
}
|
|
}
|
|
}
|
my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
|
my $balancer_token = &Apache::lonnet::tmpput(\%info,$found_server);
|
unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') ||
|
unless (($balancer_token eq 'con_lost') || ($balancer_token eq 'refused') ||
|
($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
|
($balancer_token eq 'unknown_cmd') || ($balancer_token eq 'no_such_host')) {
|
Line 228 sub handler {
|
Line 241 sub handler {
|
$balcookie = $info{'balcookie'};
|
$balcookie = $info{'balcookie'};
|
&Apache::lonnet::tmpdel($env{'form.btoken'});
|
&Apache::lonnet::tmpdel($env{'form.btoken'});
|
delete($env{'form.btoken'});
|
delete($env{'form.btoken'});
|
|
if (($env{'form.firsturl'} eq '/adm/email') &&
|
|
(exists($info{'display'})) && (exists($info{'mailrecip'}))) {
|
|
$env{'form.display'} = &unescape($info{'display'});
|
|
$env{'form.mailrecip'} = &unescape($info{'mailrecip'});
|
|
}
|
}
|
}
|
|
|
#
|
#
|
Line 339 sub handler {
|
Line 357 sub handler {
|
if ($env{'form.ltoken'}) {
|
if ($env{'form.ltoken'}) {
|
my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
|
my $delete = &Apache::lonnet::tmpdel($env{'form.ltoken'});
|
}
|
}
|
|
if (($env{'form.firsturl'} eq '/adm/email') && ($env{'form.display'})) {
|
|
if ($env{'form.mailrecip'}) {
|
|
if ($env{'form.mailrecip'} eq "$env{'user.name'}:$env{'user.domain'}") {
|
|
$dest .= (($dest=~/\?/)?'&':'?') . 'display='.&escape($env{'form.display'}).
|
|
'&mailrecip='.&escape($env{'form.mailrecip'});
|
|
}
|
|
} elsif (($env{'form.username'} eq $env{'user.name'}) && ($env{'form.domain'} eq $env{'user.domain'})) {
|
|
$dest .= (($dest=~/\?/)?'&':'?') . 'display='.&escape($env{'form.display'}).
|
|
'&mailrecip='.&escape("$env{'user.name'}:$env{'form.domain'}");
|
|
}
|
|
}
|
$r->print(
|
$r->print(
|
$start_page
|
$start_page
|
.'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
|
.'<p class="LC_warning">'.&mt('You are already logged in!').'</p>'
|
Line 464 sub handler {
|
Line 493 sub handler {
|
|
|
# -------------------------------------------------------- Store away log token
|
# -------------------------------------------------------- Store away log token
|
my ($tokenextras,$tokentype,$linkprot_for_login);
|
my ($tokenextras,$tokentype,$linkprot_for_login);
|
my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey');
|
my @names = ('role','symb','iptoken','ltoken','linkprotuser','linkprotexit','linkprot','linkkey','display');
|
foreach my $name (@names) {
|
foreach my $name (@names) {
|
if ($env{'form.'.$name} ne '') {
|
if ($env{'form.'.$name} ne '') {
|
if ($name eq 'ltoken') {
|
if ($name eq 'ltoken') {
|
Line 480 sub handler {
|
Line 509 sub handler {
|
$tokentype = 'link';
|
$tokentype = 'link';
|
last;
|
last;
|
}
|
}
|
|
} elsif ($env{'form.display'} && ($env{'form.firsturl'} eq '/adm/email')) {
|
|
if (($env{'form.mailrecip'}) ||
|
|
($env{'form.username'} =~ /^$match_username$/) && ($env{'form.domain'} =~ /^$match_domain$/)) {
|
|
$tokenextras .= '&'.$name.'='.&escape($env{'form.display'});
|
|
if ($env{'form.mailrecip'}) {
|
|
$tokenextras .= '&mailrecip='.&escape($env{'form.mailrecip'});
|
|
} else {
|
|
$tokenextras .= '&mailrecip='.&escape($env{'form.username'}.':'.$env{'form.domain'});
|
|
}
|
|
}
|
} else {
|
} else {
|
$tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
|
$tokenextras .= '&'.$name.'='.&escape($env{'form.'.$name});
|
if (($name eq 'linkkey') || ($name eq 'linkprot')) {
|
if (($name eq 'linkkey') || ($name eq 'linkprot')) {
|