version 1.167, 2016/05/03 22:27:14
|
version 1.170, 2017/02/25 19:56:09
|
Line 38 use Apache::lonlocal;
|
Line 38 use Apache::lonlocal;
|
use Apache::migrateuser();
|
use Apache::migrateuser();
|
use lib '/home/httpd/lib/perl/';
|
use lib '/home/httpd/lib/perl/';
|
use LONCAPA;
|
use LONCAPA;
|
|
use CGI::Cookie();
|
|
|
sub handler {
|
sub handler {
|
my $r = shift;
|
my $r = shift;
|
Line 56 sub handler {
|
Line 57 sub handler {
|
return &Apache::migrateuser::handler($r);
|
return &Apache::migrateuser::handler($r);
|
}
|
}
|
|
|
|
# For "public user" - remove any exising "public" cookie, as user really wants to log-in
|
|
my ($handle,$lonidsdir,$expire);
|
|
unless ($r->header_only) {
|
|
$handle = &Apache::lonnet::check_for_valid_session($r);
|
|
if ($handle ne '') {
|
|
$lonidsdir=$r->dir_config('lonIDsDir');
|
|
if ($handle=~/^publicuser\_/) {
|
|
unlink($r->dir_config('lonIDsDir')."/$handle.id");
|
|
undef($handle);
|
|
$expire = 1;
|
|
}
|
|
}
|
|
}
|
|
|
&Apache::loncommon::no_cache($r);
|
&Apache::loncommon::no_cache($r);
|
&Apache::lonlocal::get_language_handle($r);
|
&Apache::lonlocal::get_language_handle($r);
|
&Apache::loncommon::content_type($r,'text/html');
|
&Apache::loncommon::content_type($r,'text/html');
|
|
if ($expire) {
|
|
my $c = new CGI::Cookie(-name => 'lonPubID',
|
|
-value => '',
|
|
-expires => '-10y',);
|
|
$r->header_out('Set-cookie' => $c);
|
|
}
|
$r->send_http_header;
|
$r->send_http_header;
|
return OK if $r->header_only;
|
return OK if $r->header_only;
|
|
|
Line 73 sub handler {
|
Line 94 sub handler {
|
$env{'form.firsturl'} =~ s/(`)/'/g;
|
$env{'form.firsturl'} =~ s/(`)/'/g;
|
|
|
# -------------------------------- Prevent users from attempting to login twice
|
# -------------------------------- Prevent users from attempting to login twice
|
my $handle = &Apache::lonnet::check_for_valid_session($r);
|
|
if ($handle ne '') {
|
if ($handle ne '') {
|
my $lonidsdir=$r->dir_config('lonIDsDir');
|
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
|
if ($handle=~/^publicuser\_/) {
|
my $start_page =
|
# For "public user" - remove it, we apparently really want to login
|
&Apache::loncommon::start_page('Already logged in');
|
unlink($r->dir_config('lonIDsDir')."/$handle.id");
|
my $end_page =
|
} else {
|
&Apache::loncommon::end_page();
|
# Indeed, a valid token is found
|
my $dest = '/adm/roles';
|
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
|
if ($env{'form.firsturl'} ne '') {
|
my $start_page =
|
$dest = $env{'form.firsturl'};
|
&Apache::loncommon::start_page('Already logged in');
|
}
|
my $end_page =
|
$r->print(
|
&Apache::loncommon::end_page();
|
|
my $dest = '/adm/roles';
|
|
if ($env{'form.firsturl'} ne '') {
|
|
$dest = $env{'form.firsturl'};
|
|
}
|
|
$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>'
|
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
|
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
|
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
|
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
|
.$end_page
|
.$end_page
|
);
|
);
|
return OK;
|
return OK;
|
}
|
|
}
|
}
|
|
|
# ---------------------------------------------------- No valid token, continue
|
# ---------------------------------------------------- No valid token, continue
|
Line 523 LFORM
|
Line 536 LFORM
|
$r->print(<<HEADER);
|
$r->print(<<HEADER);
|
<!-- The LON-CAPA Header -->
|
<!-- The LON-CAPA Header -->
|
<div style="background:$pgbg;margin:0;width:100%;">
|
<div style="background:$pgbg;margin:0;width:100%;">
|
<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
|
<img src="$img" border="0" alt="The Learning Online Network with CAPA" class="LC_maxwidth" />
|
</div>
|
</div>
|
HEADER
|
HEADER
|
}
|
}
|
Line 547 HEADER
|
Line 560 HEADER
|
<div>
|
<div>
|
ENDTOP
|
ENDTOP
|
if ($showmainlogo) {
|
if ($showmainlogo) {
|
$r->print(' <img src="'.$logo.'" alt="" />'."\n");
|
$r->print(' <img src="'.$logo.'" alt="" class="LC_maxwidth" />'."\n");
|
}
|
}
|
$r->print(<<ENDTOP);
|
$r->print(<<ENDTOP);
|
$announcements
|
$announcements
|