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.13 and 1.133

version 1.121.2.13, 2015/01/26 22:25:41	version 1.133, 2014/04/06 13:40:19
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);
$desturl = &Apache::lonnet::clutter($desturl);	unless ($desturl=~/^(adm\|editupload\|public)/) {
	$desturl = &Apache::lonnet::clutter($desturl);
	}
$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.
Line 118 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 153 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
return;
}	}

# --------------------------------------------------------------- Failed login!	# --------------------------------------------------------------- Failed login!
Line 317 sub handler {	Line 308 sub handler {
my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},	my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'},
$form{'serverid'});	$form{'serverid'});

	my %sessiondata;
	if ($form{'iptoken'}) {
	%sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
	my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
	}

if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|	if (($tmpinfo=~/^error/) \|\| ($tmpinfo eq 'con_lost') \|\|
($tmpinfo eq 'no_such_host')) {	($tmpinfo eq 'no_such_host')) {
&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);	&failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form);
Line 336 sub handler {	Line 333 sub handler {
return OK;	return OK;
}	}

my ($key,$firsturl,$rolestr,$symbstr,$iptokenstr)=split(/&/,$tmpinfo);	my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo);
if ($rolestr) {	if ($rolestr) {
$rolestr = &unescape($rolestr);	$rolestr = &unescape($rolestr);
}	}
if ($symbstr) {	if ($symbstr) {
$symbstr= &unescape($symbstr);	$symbstr= &unescape($symbstr);
}	}
if ($iptokenstr) {
$iptokenstr = &unescape($iptokenstr);
}
if ($rolestr =~ /^role=/) {	if ($rolestr =~ /^role=/) {
(undef,$form{'role'}) = split('=',$rolestr);	(undef,$form{'role'}) = split('=',$rolestr);
}	}
if ($symbstr =~ /^symb=/) {	if ($symbstr =~ /^symb=/) {
(undef,$form{'symb'}) = split('=',$symbstr);	(undef,$form{'symb'}) = split('=',$symbstr);
}	}
if ($iptokenstr =~ /^iptoken=/) {
(undef,$form{'iptoken'}) = split('=',$iptokenstr);
}

my $keybin=pack("H16",$key);	my $keybin=pack("H16",$key);

Line 406 sub handler {	Line 397 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 =
Line 439 sub handler {	Line 429 sub handler {

my $hosthere;	my $hosthere;
if ($form{'iptoken'}) {	if ($form{'iptoken'}) {
my %sessiondata = &Apache::lonnet::tmpget($form{'iptoken'});
my $delete = &Apache::lonnet::tmpdel($form{'iptoken'});
if (($sessiondata{'domain'} eq $form{'udom'}) &&	if (($sessiondata{'domain'} eq $form{'udom'}) &&
($sessiondata{'username'} eq $form{'uname'})) {	($sessiondata{'username'} eq $form{'uname'})) {
$hosthere = 1;	$hosthere = 1;

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

Removed from v.1.121.2.13
changed lines
	Added in v.1.133