loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.155 and 1.157

version 1.155, 2013/01/28 02:00:58	version 1.157, 2013/09/29 00:49:24
Line 46 sub handler {	Line 46 sub handler {
(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
$ENV{'REDIRECT_QUERY_STRING'}),	$ENV{'REDIRECT_QUERY_STRING'}),
['interface','username','domain','firsturl','localpath','localres',	['interface','username','domain','firsturl','localpath','localres',
'token','role','symb']);	'token','role','symb','iptoken']);
if (!defined($env{'form.firsturl'})) {	if (!defined($env{'form.firsturl'})) {
&Apache::lonacc::get_posted_cgi($r,['firsturl']);	&Apache::lonacc::get_posted_cgi($r,['firsturl']);
}	}
Line 103 sub handler {	Line 103 sub handler {

# ---------------------------------------------------- No valid token, continue	# ---------------------------------------------------- No valid token, continue

# ---------------------------- Not possible to really login to domain "public"	# ---------------------------- Not possible to really login to domain "public"
if ($env{'form.domain'} eq 'public') {	if ($env{'form.domain'} eq 'public') {
$env{'form.domain'}='';	$env{'form.domain'}='';
$env{'form.username'}='';	$env{'form.username'}='';
}	}

	# ------ Is this page requested because /adm/migrateuser detected an IP change?
	my %sessiondata;
	if ($env{'form.iptoken'}) {
	%sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'});
	my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
	}
# ----------------------------------------------------------- Process Interface	# ----------------------------------------------------------- Process Interface
$env{'form.interface'}=~s/\W//g;	$env{'form.interface'}=~s/\W//g;

my $httpbrowser=$ENV{"HTTP_USER_AGENT"};	(undef,undef,undef,undef,undef,undef,my $clientmobile) =
	&Apache::loncommon::decode_user_agent();

my $iconpath=	my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
Line 119 sub handler {	Line 127 sub handler {
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
my $domain = &Apache::lonnet::default_login_domain();	my $domain = &Apache::lonnet::default_login_domain();
if ($lonhost ne '') {	if ($lonhost ne '') {
my $redirect = &check_loginvia($domain,$lonhost);	unless ($sessiondata{'sessionserver'}) {
if ($redirect) {	my $redirect = &check_loginvia($domain,$lonhost);
$r->print($redirect);	if ($redirect) {
return OK;	$r->print($redirect);
}	return OK;
	}
	}
}	}

if (($env{'form.domain'}) &&	if (($sessiondata{'domain'}) &&
	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
	$domain=$sessiondata{'domain'};
	} elsif (($env{'form.domain'}) &&
(&Apache::lonnet::domain($env{'form.domain'},'description'))) {	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$env{'form.domain'};	$domain=$env{'form.domain'};
}	}

my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');	my $loadlim = $r->dir_config('lonLoadLim');
my $uloadlim= $r->dir_config('lonUserLoadLim');	my $uloadlim= $r->dir_config('lonUserLoadLim');
Line 141 sub handler {	Line 155 sub handler {
my $host_name = &Apache::lonnet::hostname($lonhost);	my $host_name = &Apache::lonnet::hostname($lonhost);

# --------------------------------------------- Default values for login fields	# --------------------------------------------- Default values for login fields

my $authusername=($env{'form.username'}?$env{'form.username'}:'');	my ($authusername,$authdomain);
my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);	if ($sessiondata{'username'}) {
	$authusername=$sessiondata{'username'};
	} else {
	$authusername=($env{'form.username'}?$env{'form.username'}:'');
	}
	if ($sessiondata{'domain'}) {
	$authdomain=$sessiondata{'domain'};
	} else {
	$authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);
	}

# ---------------------------------------------------------- Determine own load	# ---------------------------------------------------------- Determine own load
my $loadavg;	my $loadavg;
Line 433 ENDSERVERFORM	Line 456 ENDSERVERFORM
$authdomain,\$helpdeskscript,	$authdomain,\$helpdeskscript,
$showhelpdesk,\@possdoms);	$showhelpdesk,\@possdoms);

	my $mobileargs;
	if ($clientmobile) {
	$mobileargs = 'autocapitalize="off" autocorrect="off"';
	}
my $loginform=(<<LFORM);	my $loginform=(<<LFORM);
<form name="client" action="" onsubmit="return(send())">	<form name="client" action="" onsubmit="return(send())">
<input type="hidden" name="lextkey" value="$lextkey" />	<input type="hidden" name="lextkey" value="$lextkey" />
<input type="hidden" name="uextkey" value="$uextkey" />	<input type="hidden" name="uextkey" value="$uextkey" />
<b><label for="uname">$lt{'un'}</label>:</b><br />	<b><label for="uname">$lt{'un'}</label>:</b><br />
<input type="text" name="uname" id="uname" size="15" value="$authusername" readonly="readonly" /><br />	<input type="text" name="uname" id="uname" size="15" value="$authusername" readonly="readonly" $mobileargs /><br />
<b><label for="upass$now">$lt{'pw'}</label>:</b><br />	<b><label for="upass$now">$lt{'pw'}</label>:</b><br />
<input type="password" name="upass$now" id="upass$now" size="15" readonly="readonly" /><br />	<input type="password" name="upass$now" id="upass$now" size="15" readonly="readonly" /><br />
<b><label for="udom">$lt{'dom'}</label>:</b><br />	<b><label for="udom">$lt{'dom'}</label>:</b><br />
<input type="text" name="udom" id="udom" size="15" value="$authdomain" readonly="readonly" /><br />	<input type="text" name="udom" id="udom" size="15" value="$authdomain" readonly="readonly" $mobileargs /><br />
<input type="submit" value="$lt{'log'}" />	<input type="submit" value="$lt{'log'}" />
</form>	</form>
LFORM	LFORM

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

Removed from v.1.155
changed lines
	Added in v.1.157