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.152 and 1.156

version 1.152, 2012/08/27 00:52:45	version 1.156, 2013/09/13 21:28:18
Line 111 sub handler {	Line 111 sub handler {
# ----------------------------------------------------------- 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 289 sub handler {	Line 290 sub handler {
if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {	if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) {
$showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);	$showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain);
}	}
my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);	my $showadminmail;
	my @possdoms = &Apache::lonnet::current_machine_domains();
	if (grep(/^\Q$domain\E$/,@possdoms)) {
	$showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
	}
my $showcoursecat =	my $showcoursecat =
&Apache::loncommon::designparm('login.coursecatalog',$domain);	&Apache::loncommon::designparm('login.coursecatalog',$domain);
my $shownewuserlink =	my $shownewuserlink =
&Apache::loncommon::designparm('login.newuser',$domain);	&Apache::loncommon::designparm('login.newuser',$domain);
	my $showhelpdesk =
	&Apache::loncommon::designparm('login.helpdesk',$domain);
my $now=time;	my $now=time;
my $js = (<<ENDSCRIPT);	my $js = (<<ENDSCRIPT);

Line 424 ENDSERVERFORM	Line 431 ENDSERVERFORM
.'</b></span></noscript>';	.'</b></span></noscript>';
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,	my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
$authdomain,\$helpdeskscript);	$authdomain,\$helpdeskscript,
	$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
Line 617 sub redirect_page {	Line 629 sub redirect_page {
}	}

sub contactdisplay {	sub contactdisplay {
my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_;	my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript,$showhelpdesk,
	$possdoms) = @_;
my $contactblock;	my $contactblock;
my $showhelpdesk = 0;	my $origmail;
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};	if (ref($possdoms) eq 'ARRAY') {
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {	if (grep(/^\Q$authdomain\E$/,@{$possdoms})) {
$showhelpdesk = 1;	$origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
	}
	}
	my $requestmail =
	&Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
	$authdomain,$origmail);
	unless ($showhelpdesk eq '0') {
	if ($requestmail =~ m/[^\@]+\@[^\@]+/) {
	$showhelpdesk = 1;
	} else {
	$showhelpdesk = 0;
	}
}	}
if ($servadm && $showadminmail) {	if ($servadm && $showadminmail) {
$contactblock .= $$lt{'servadm'}.':<br />'.	$contactblock .= $$lt{'servadm'}.':<br />'.
Line 635 sub contactdisplay {	Line 659 sub contactdisplay {
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
function helpdesk() {	function helpdesk() {
var codedom = document.client.udom.value;	var possdom = document.client.udom.value;
	var codedom = possdom.replace( new RegExp("[^A-Za-z0-9.\\-]","g"),'');
if (codedom == '') {	if (codedom == '') {
codedom = "$authdomain";	codedom = "$authdomain";
}	}

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

Removed from v.1.152
changed lines
	Added in v.1.156