version 1.157, 2013/09/29 00:49:24
|
version 1.158.2.5, 2016/08/11 00:37:33
|
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 126 sub handler {
|
Line 129 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(); |
|
my $defdom = $domain; |
if ($lonhost ne '') { |
if ($lonhost ne '') { |
unless ($sessiondata{'sessionserver'}) { |
unless ($sessiondata{'sessionserver'}) { |
my $redirect = &check_loginvia($domain,$lonhost); |
my $redirect = &check_loginvia($domain,$lonhost); |
Line 160 sub handler {
|
Line 164 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 226 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 341 lextkey=this.document.client.elements.le
|
Line 353 lextkey=this.document.client.elements.le
|
initkeys(); |
initkeys(); |
|
|
this.document.server.elements.upass0.value |
this.document.server.elements.upass0.value |
=crypted(this.document.client.elements.upass$now.value.substr(0,15)); |
=getCrypted(this.document.client.elements.upass$now.value); |
this.document.server.elements.upass1.value |
|
=crypted(this.document.client.elements.upass$now.value.substr(15,15)); |
|
this.document.server.elements.upass2.value |
|
=crypted(this.document.client.elements.upass$now.value.substr(30,15)); |
|
|
|
this.document.client.elements.uname.value=''; |
this.document.client.elements.uname.value=''; |
this.document.client.elements.upass$now.value=''; |
this.document.client.elements.upass$now.value=''; |
Line 376 ENDSCRIPT
|
Line 384 ENDSCRIPT
|
alink => "$alink", |
alink => "$alink", |
onload => 'javascript:enableInput();',); |
onload => 'javascript:enableInput();',); |
|
|
|
my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf); |
|
@hosts = &Apache::lonnet::current_machine_ids(); |
|
$lonhost_in_use = $lonhost; |
|
if (@hosts > 1) { |
|
foreach my $hostid (@hosts) { |
|
if (&Apache::lonnet::host_domain($hostid) eq $defdom) { |
|
$lonhost_in_use = $hostid; |
|
last; |
|
} |
|
} |
|
} |
|
%defaultdomconf = &Apache::loncommon::get_domainconf($defdom); |
|
$headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use}; |
|
$headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use}; |
|
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_in_use/\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, |
Line 426 ENDSCRIPT
|
Line 468 ENDSCRIPT
|
<input type="hidden" name="serverid" value="$lonhost" /> |
<input type="hidden" name="serverid" value="$lonhost" /> |
<input type="hidden" name="uname" value="" /> |
<input type="hidden" name="uname" value="" /> |
<input type="hidden" name="upass0" value="" /> |
<input type="hidden" name="upass0" value="" /> |
<input type="hidden" name="upass1" value="" /> |
|
<input type="hidden" name="upass2" value="" /> |
|
<input type="hidden" name="udom" value="" /> |
<input type="hidden" name="udom" value="" /> |
<input type="hidden" name="localpath" value="$env{'form.localpath'}" /> |
<input type="hidden" name="localpath" value="$env{'form.localpath'}" /> |
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |
<input type="hidden" name="localres" value="$env{'form.localres'}" /> |