loncom/auth/lonauth.pm - diff

Return to lonauth.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonauth.pm between versions 1.121.2.8 and 1.121.2.10

version 1.121.2.8, 2014/01/05 11:38:43	version 1.121.2.10, 2014/04/06 13:52:36
Line 206 sub failed {	Line 206 sub failed {
my $end_page = &Apache::loncommon::end_page();	my $end_page = &Apache::loncommon::end_page();
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
	my @actions =
	(&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>'));
my $loginhelp = &loginhelpdisplay($udom);	my $loginhelp = &loginhelpdisplay($udom);
if ($loginhelp) {	if ($loginhelp) {
$loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';	push(@actions, '<a href="'.$loginhelp.'">'.&mt('Login problems?').'</a>');
}	}
	#FIXME: link to helpdesk might be added here

$r->print(	$r->print(
$start_page	$start_page
.'<h1>'.&mt('Sorry ...').'</h1>'	.'<h2>'.&mt('Sorry ...').'</h2>'
.'<p class="LC_warning">'.&mt($message).'</p>'	.&Apache::lonhtmlcommon::confirm_success(&mt($message),1).'<br /><br />'
.'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')	.&Apache::lonhtmlcommon::actionbox(\@actions)
.'</p>'
.$loginhelp
.$end_page	.$end_page
);	);
}	}
Line 320 sub handler {	Line 321 sub handler {
my %sessiondata;	my %sessiondata;
if ($form{'iptoken'}) {	if ($form{'iptoken'}) {
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});	%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
my $delete = &Apache::lonnet::tmpdel($form{'token'});	my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
}	}

if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|	if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.121.2.8
changed lines
	Added in v.1.121.2.10