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 and 1.124

version 1.121, 2012/04/11 11:40:07	version 1.124, 2012/12/18 20:52:18
Line 103 sub success {	Line 103 sub success {
if ($destsymb =~ /___/) {	if ($destsymb =~ /___/) {
# FIXME Need to deal with encrypted symbs and urls as needed.	# FIXME Need to deal with encrypted symbs and urls as needed.
my ($map,$resid,$desturl)=split(/___/,$destsymb);	my ($map,$resid,$desturl)=split(/___/,$destsymb);
unless ($desturl=~/^(adm\|uploaded\|editupload\|public)/) {	unless ($desturl=~/^(adm\|editupload\|public)/) {
$desturl = &Apache::lonnet::clutter($desturl);	$desturl = &Apache::lonnet::clutter($desturl);
}	}
$desturl = &HTML::Entities::encode($desturl,'"<>&');	$desturl = &HTML::Entities::encode($desturl,'"<>&');
Line 139 sub success {	Line 139 sub success {
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'wel' => 'Welcome',	'wel' => 'Welcome',
'pro' => 'Login problems?',	'pro' => 'Login problems?',
'log' => 'loginproblems.html',
);	);
	my $loginhelp = &loginhelpdisplay($domain);
	if ($loginhelp) {
	$loginhelp = '<p><a href="'.$loginhelp.'">'.$lt{'pro'}.'</a></p>';
	}

my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');	my $welcome = &mt('Welcome to the Learning[_1]Online[_2] Network with CAPA. Please wait while your session is being set up.','<i>','</i>');
$r->print(<<ENDSUCCESS);	$r->print(<<ENDSUCCESS);
$start_page	$start_page
$windowinfo	$windowinfo
<h1>$lt{'wel'}</h1>	<h1>$lt{'wel'}</h1>
$welcome<p>	$welcome
<a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>	$loginhelp
$continuelink	$continuelink
$end_page	$end_page
ENDSUCCESS	ENDSUCCESS
Line 169 sub failed {	Line 173 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 $loginhelp = &loginhelpdisplay($form->{'udom'});
	if ($loginhelp) {
	$loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';
	}

$r->print(	$r->print(
$start_page	$start_page
.'<h1>'.&mt('Sorry ...').'</h1>'	.'<h1>'.&mt('Sorry ...').'</h1>'
.'<p class="LC_warning">'.&mt($message).'</p>'	.'<p class="LC_warning">'.&mt($message).'</p>'
.'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')	.'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')
.'</p>'	.'</p>'
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'	.$loginhelp
.$end_page	.$end_page
);	);
}	}
Line 543 sub noswitch {	Line 552 sub noswitch {
return $result;	return $result;
}	}

	sub loginhelpdisplay {
	my ($authdomain) = @_;
	my $login_help = 1;
	my $lang = &Apache::lonlocal::current_language();
	if ($login_help) {
	my $dom = $authdomain;
	if ($dom eq '') {
	$dom = &Apache::lonnet::default_login_domain();
	}
	my %domconfhash = &Apache::loncommon::get_domainconf($dom);
	my $loginhelp_url;
	if ($lang) {
	$loginhelp_url = $domconfhash{$dom.'.login.helpurl_'.$lang};
	if ($loginhelp_url ne '') {
	return $loginhelp_url;
	}
	}
	$loginhelp_url = $domconfhash{$dom.'.login.helpurl_nolang'};
	if ($loginhelp_url ne '') {
	return $loginhelp_url;
	} else {
	return '/adm/loginproblems.html';
	}
	}
	return;
	}

1;	1;
__END__	__END__

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

Removed from v.1.121
changed lines
	Added in v.1.124