version 1.157, 2013/09/29 00:49:24
|
version 1.158.2.2, 2015/03/06 22:36:56
|
Line 113 sub handler {
|
Line 113 sub handler {
|
my %sessiondata; |
my %sessiondata; |
if ($env{'form.iptoken'}) { |
if ($env{'form.iptoken'}) { |
%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); |
%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'}); |
my $delete = &Apache::lonnet::tmpdel($env{'form.token'}); |
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 160 sub handler {
|
Line 163 sub handler {
|
if ($sessiondata{'username'}) { |
if ($sessiondata{'username'}) { |
$authusername=$sessiondata{'username'}; |
$authusername=$sessiondata{'username'}; |
} else { |
} else { |
|
$env{'form.username'} = &Apache::loncommon::cleanup_html($env{'form.username'}); |
$authusername=($env{'form.username'}?$env{'form.username'}:''); |
$authusername=($env{'form.username'}?$env{'form.username'}:''); |
} |
} |
if ($sessiondata{'domain'}) { |
if ($sessiondata{'domain'}) { |
$authdomain=$sessiondata{'domain'}; |
$authdomain=$sessiondata{'domain'}; |
} else { |
} else { |
|
$env{'form.domain'} = &Apache::loncommon::cleanup_html($env{'form.domain'}); |
$authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); |
$authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); |
} |
} |
|
|
Line 220 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); |
Line 376 ENDSCRIPT
|
Line 387 ENDSCRIPT
|
alink => "$alink", |
alink => "$alink", |
onload => 'javascript:enableInput();',); |
onload => 'javascript:enableInput();',); |
|
|
|
my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom); |
|
my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost}; |
|
my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost}; |
|
if ($headextra) { |
|
my $omitextra; |
|
if ($headextra_exempt ne '') { |
|
my @exempt = split(',',$headextra_exempt); |
|
my $ip = $ENV{'REMOTE_ADDR'}; |
|
if (grep(/^\Q$ip\E$/,@exempt)) { |
|
$omitextra = 1; |
|
} |
|
} |
|
unless ($omitextra) { |
|
my $confname = $defdom.'-domainconfig'; |
|
if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost/\E}) { |
|
my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra)); |
|
unless ($extra eq '-1') { |
|
$js .= "\n".$extra."\n"; |
|
} |
|
} |
|
} |
|
} |
|
|
$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, |
$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, |
{ 'redirect' => [$expire,'/adm/roles'], |
{ 'redirect' => [$expire,'/adm/roles'], |
'add_entries' => \%add_entries, |
'add_entries' => \%add_entries, |