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.6 and 1.130

version 1.121.2.6, 2013/09/29 19:31:03	version 1.130, 2014/01/05 11:04:27
Line 108 sub success {	Line 108 sub success {
}	}
$desturl = &HTML::Entities::encode($desturl,'"<>&');	$desturl = &HTML::Entities::encode($desturl,'"<>&');
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');	$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
$destination .= '&destinationurl='.$desturl.	$destination .= 'destinationurl='.$desturl.
'&destsymb='.$destsymb;	'&destsymb='.$destsymb;
} else {	} else {
$destsymb = &HTML::Entities::encode($destsymb,'"<>&');	$destsymb = &HTML::Entities::encode($destsymb,'"<>&');
$destination .= '&destinationurl='.$destsymb;	$destination .= 'destinationurl='.$destsymb;
}	}
}	}
if ($destination =~ m{^/adm/roles}) {	if ($destination =~ m{^/adm/roles}) {
Line 120 sub success {	Line 120 sub success {
$destination .= 'source=login';	$destination .= 'source=login';
}	}

my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});	my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
my $startupremote=&Apache::lonmenu::startupremote($destination);	my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
my $setflags=&Apache::lonmenu::setflags();
my $maincall=&Apache::lonmenu::maincall();
my $brcrum = [{'href' => '',	my $brcrum = [{'href' => '',
'text' => 'Successful Login'},];	'text' => 'Successful Login'},];
my $start_page=&Apache::loncommon::start_page('Successful Login',	my $start_page=&Apache::loncommon::start_page('Successful Login',
$startupremote,	$header,
{'no_inline_link' => 1,	{'bread_crumbs' => $brcrum,});
'bread_crumbs' => $brcrum,});
my $end_page =&Apache::loncommon::end_page();	my $end_page =&Apache::loncommon::end_page();

my $continuelink;	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
if ($env{'environment.remote'} eq 'off') {
$continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
}
# ------------------------------------------------- Output for successful login	# ------------------------------------------------- Output for successful login

&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
Line 155 sub success {	Line 148 sub success {
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
$setflags
$windowinfo	$windowinfo
<h1>$lt{'wel'}</h1>	<h1>$lt{'wel'}</h1>
$welcome	$welcome
$loginhelp	$loginhelp
$remoteinfo
$maincall
$continuelink	$continuelink
$end_page	$end_page
ENDSUCCESS	ENDSUCCESS
Line 171 ENDSUCCESS	Line 161 ENDSUCCESS

sub failed {	sub failed {
my ($r,$message,$form) = @_;	my ($r,$message,$form) = @_;
my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef);	(undef,undef,undef,my $clientmathml,my $clientunicode) =
my $retry = '/adm/login?username='.$form->{'uname'}.	&Apache::loncommon::decode_user_agent();
'&domain='.$form->{'udom'};	my $args = {};
	if ($clientunicode && !$clientmathml) {
	$args = {'browser.unicode' => 1};
	}

	my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
	my $uname = &Apache::loncommon::cleanup_html($form->{'uname'});
	my $udom = &Apache::loncommon::cleanup_html($form->{'udom'});
	if (&Apache::lonnet::domain($udom,'description') eq '') {
	undef($udom);
	}
	my $retry = '/adm/login';
	if ($uname eq $form->{'uname'}) {
	$retry .= '?username='.$uname;
	}
	if ($udom) {
	$retry .= (($retry=~/\?/)?'&':'?').'domain='.$udom;
	}
if (exists($form->{role})) {	if (exists($form->{role})) {
$retry .= '&role='.$form->{role};	my $role = &Apache::loncommon::cleanup_html($form->{role});
	if ($role ne '') {
	$retry .= (($retry=~/\?/)?'&':'?').'role='.$role;
	}
}	}
if (exists($form->{symb})) {	if (exists($form->{symb})) {
$retry .= '&symb='.$form->{symb};	my $symb = &Apache::loncommon::cleanup_html($form->{symb});
	if ($symb ne '') {
	$retry .= (($retry=~/\?/)?'&':'?').'symb='.$symb;
	}
}	}
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'});	my $loginhelp = &loginhelpdisplay($udom);
if ($loginhelp) {	if ($loginhelp) {
$loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';	$loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';
}	}
Line 293 sub handler {	Line 306 sub handler {

my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},	my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
$form{'serverid'});	$form{'serverid'});

my %sessiondata;	my %sessiondata;
if ($form{'iptoken'}) {	if ($form{'iptoken'}) {
%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});	%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
Line 382 sub handler {	Line 396 sub handler {
return OK;	return OK;
}	}
my $start_page =	my $start_page =
&Apache::loncommon::start_page('Create a user account in LON-CAPA',	&Apache::loncommon::start_page('Create a user account in LON-CAPA');
'',{'no_inline_link' => 1,});
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};	my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
my $contacts =	my $contacts =

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

Removed from v.1.121.2.6
changed lines
	Added in v.1.130