version 1.156, 2013/09/13 21:28:18
|
version 1.159, 2014/10/04 02:59:32
|
Line 46 sub handler {
|
Line 46 sub handler {
|
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, |
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, |
$ENV{'REDIRECT_QUERY_STRING'}), |
$ENV{'REDIRECT_QUERY_STRING'}), |
['interface','username','domain','firsturl','localpath','localres', |
['interface','username','domain','firsturl','localpath','localres', |
'token','role','symb']); |
'token','role','symb','iptoken']); |
if (!defined($env{'form.firsturl'})) { |
if (!defined($env{'form.firsturl'})) { |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
&Apache::lonacc::get_posted_cgi($r,['firsturl']); |
} |
} |
Line 103 sub handler {
|
Line 103 sub handler {
|
|
|
# ---------------------------------------------------- No valid token, continue |
# ---------------------------------------------------- No valid token, continue |
|
|
# ---------------------------- Not possible to really login to domain "public" |
# ---------------------------- Not possible to really login to domain "public" |
if ($env{'form.domain'} eq 'public') { |
if ($env{'form.domain'} eq 'public') { |
$env{'form.domain'}=''; |
$env{'form.domain'}=''; |
$env{'form.username'}=''; |
$env{'form.username'}=''; |
} |
} |
|
|
|
# ------ Is this page requested because /adm/migrateuser detected an IP change? |
|
my %sessiondata; |
|
if ($env{'form.iptoken'}) { |
|
%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); |
|
unless ($sessiondata{'sessionserver'}) { |
|
my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'}); |
|
delete($env{'form.iptoken'}); |
|
} |
|
} |
# ----------------------------------------------------------- Process Interface |
# ----------------------------------------------------------- Process Interface |
$env{'form.interface'}=~s/\W//g; |
$env{'form.interface'}=~s/\W//g; |
|
|
Line 120 sub handler {
|
Line 130 sub handler {
|
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
my $domain = &Apache::lonnet::default_login_domain(); |
my $domain = &Apache::lonnet::default_login_domain(); |
if ($lonhost ne '') { |
if ($lonhost ne '') { |
my $redirect = &check_loginvia($domain,$lonhost); |
unless ($sessiondata{'sessionserver'}) { |
if ($redirect) { |
my $redirect = &check_loginvia($domain,$lonhost); |
$r->print($redirect); |
if ($redirect) { |
return OK; |
$r->print($redirect); |
} |
return OK; |
|
} |
|
} |
} |
} |
|
|
if (($env{'form.domain'}) && |
if (($sessiondata{'domain'}) && |
|
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
|
$domain=$sessiondata{'domain'}; |
|
} elsif (($env{'form.domain'}) && |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
$domain=$env{'form.domain'}; |
$domain=$env{'form.domain'}; |
} |
} |
|
|
my $role = $r->dir_config('lonRole'); |
my $role = $r->dir_config('lonRole'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $uloadlim= $r->dir_config('lonUserLoadLim'); |
my $uloadlim= $r->dir_config('lonUserLoadLim'); |
Line 142 sub handler {
|
Line 158 sub handler {
|
my $host_name = &Apache::lonnet::hostname($lonhost); |
my $host_name = &Apache::lonnet::hostname($lonhost); |
|
|
# --------------------------------------------- Default values for login fields |
# --------------------------------------------- Default values for login fields |
|
|
my $authusername=($env{'form.username'}?$env{'form.username'}:''); |
my ($authusername,$authdomain); |
my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); |
if ($sessiondata{'username'}) { |
|
$authusername=$sessiondata{'username'}; |
|
} else { |
|
$env{'form.username'} = &Apache::loncommon::cleanup_html($env{'form.username'}); |
|
$authusername=($env{'form.username'}?$env{'form.username'}:''); |
|
} |
|
if ($sessiondata{'domain'}) { |
|
$authdomain=$sessiondata{'domain'}; |
|
} else { |
|
$env{'form.domain'} = &Apache::loncommon::cleanup_html($env{'form.domain'}); |
|
$authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); |
|
} |
|
|
# ---------------------------------------------------------- Determine own load |
# ---------------------------------------------------------- Determine own load |
my $loadavg; |
my $loadavg; |
Line 198 sub handler {
|
Line 225 sub handler {
|
} |
} |
$tokenextras .= '&symb='.&escape($env{'form.symb'}); |
$tokenextras .= '&symb='.&escape($env{'form.symb'}); |
} |
} |
|
if ($env{'form.iptoken'}) { |
|
if (!$tokenextras) { |
|
$tokenextras = '&&'; |
|
} |
|
$tokenextras .= '&iptoken='.&escape($env{'form.iptoken'}); |
|
} |
my $logtoken=Apache::lonnet::reply( |
my $logtoken=Apache::lonnet::reply( |
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, |
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, |
$lonhost); |
$lonhost); |