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.127 and 1.132

version 1.127, 2009/10/06 23:43:21	version 1.132, 2010/02/08 13:28:40
Line 85 sub handler {	Line 85 sub handler {
if ($env{'form.firsturl'} ne '') {	if ($env{'form.firsturl'} ne '') {
$dest = $env{'form.firsturl'};	$dest = $env{'form.firsturl'};
}	}

	my $dom = &Apache::lonnet::default_login_domain();
	my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);

	my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'};
	if ($loginhelp_page eq '') {
	$loginhelp_page = '/adm/loginproblems.html';
	}
$r->print(	$r->print(
$start_page	$start_page
.'<h1>'.&mt('You are already logged in!').'</h1>'	.'<h1>'.&mt('You are already logged in!').'</h1>'
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',	.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'	'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'	.'<p><a href="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>'
.$end_page	.$dom.' '.$end_page
);	);
return OK;	return OK;
}	}
Line 117 sub handler {	Line 125 sub handler {
if ($lonhost ne '') {	if ($lonhost ne '') {
my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};	my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
if (($loginvia ne '') && ($loginvia ne $lonhost)) {	if (($loginvia ne '') && ($loginvia ne $lonhost)) {
my %servers = &Apache::lonnet::get_servers($domain);	if (&Apache::lonnet::hostname($loginvia) ne '') {
if ($servers{$loginvia} ne '') {
$r->print(&redirect_page($loginvia));	$r->print(&redirect_page($loginvia));
return OK;	return OK;
}	}
Line 267 my $alink=&Apache::loncommon::designparm	Line 274 my $alink=&Apache::loncommon::designparm
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);	my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
my $logo=&Apache::loncommon::designparm('login.logo',$domain);	my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);	my $img=&Apache::loncommon::designparm('login.img',$domain);
my $domainlogo=&Apache::loncommon::domainlogo($domain);	my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
my $login=&Apache::loncommon::designparm('login.login',$domain);	my $login=&Apache::loncommon::designparm('login.login',$domain);
if ($login eq '') {	if ($login eq '') {
$login = $iconpath.'/'.&mt('userauthentication.gif');	$login = $iconpath.'/'.&mt('userauthentication.gif');
Line 338 $r->print(&Apache::loncommon::start_page	Line 345 $r->print(&Apache::loncommon::start_page
# ----------------------------------------------------------------------- Texts	# ----------------------------------------------------------------------- Texts

my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'un' => 'Username',	'un' => 'Username',
'pw' => 'Password',	'pw' => 'Password',
'dom' => 'Domain',	'dom' => 'Domain',
'perc' => 'percent',	'perc' => 'percent',
'load' => 'Server Load',	'load' => 'Server Load',
'userload' => 'User Load',	'userload' => 'User Load',
'catalog' => 'Course Catalog',	'catalog' => 'Course/Community Catalog',
'log' => 'Log in',	'log' => 'Log in',
'help' => 'Log-in Help',	'help' => 'Log-in Help',
'serv' => 'Server',	'serv' => 'Server',
'servadm' => 'Server Administration',	'servadm' => 'Server Administration',
'helpdesk' => 'Contact Helpdesk',	'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot password?',	'forgotpw' => 'Forgot password?',
'newuser' => 'New User?',	'newuser' => 'New User?',
);	);
# -------------------------------------------------- Change password field name	# -------------------------------------------------- Change password field name

my $forgotpw = &forgotpwdisplay(%lt);	my $forgotpw = &forgotpwdisplay(%lt);
	$forgotpw .= '<br />' if $forgotpw;
my $loginhelp = &loginhelpdisplay(%lt);	my $loginhelp = &loginhelpdisplay(%lt);
	$loginhelp .= '<br />' if $loginhelp;

# ---------------------------------------------------- Serve out DES JavaScript	# ---------------------------------------------------- Serve out DES JavaScript
{	{
Line 387 $r->print(<<ENDSERVERFORM);	Line 397 $r->print(<<ENDSERVERFORM);
ENDSERVERFORM	ENDSERVERFORM
my $coursecatalog;	my $coursecatalog;
if (($showcoursecat eq '') \|\| ($showcoursecat)) {	if (($showcoursecat eq '') \|\| ($showcoursecat)) {
$coursecatalog = &coursecatalog_link($lt{'catalog'});	$coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />';
}	}
my $newuserlink;	my $newuserlink;
if ($shownewuserlink) {	if ($shownewuserlink) {
Line 406 my $noscript_warning='<noscript><span cl	Line 416 my $noscript_warning='<noscript><span cl
.'</b></span></noscript>';	.'</b></span></noscript>';
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,	my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
$version,$authdomain,\$helpdeskscript);	$authdomain,\$helpdeskscript);

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" size="15" value="$authusername" /><br />	<input type="text" name="uname" id="uname" size="15" value="$authusername" /><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" size="15" /><br />	<input type="password" name="upass$now" id="upass$now" size="15" /><br />
<b><label for="udom">$lt{'dom'}</label>:</b><br />	<b><label for="udom">$lt{'dom'}</label>:</b><br />
<input type="text" name="udom" size="15" value="$authdomain" /><br />	<input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br />
<input type="submit" value="$lt{'log'}" />	<input type="submit" value="$lt{'log'}" />
</form>	</form>
LFORM	LFORM
Line 425 LFORM	Line 435 LFORM
if ($showbanner) {	if ($showbanner) {
$r->print(<<HEADER);	$r->print(<<HEADER);
<!-- The LON-CAPA Header -->	<!-- The LON-CAPA Header -->
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">	<div style="background:$pgbg;margin:0;width:100%;">
<tr>	<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
<td align="left" valign="top" bgcolor="$pgbg">	</div>
<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
</td>
</tr>
</table>
HEADER	HEADER
}	}
$r->print(<<ENDTOP);	$r->print(<<ENDTOP);
Line 450 HEADER	Line 456 HEADER
</div>	</div>

<div class="LC_loginpage_loginInfo">	<div class="LC_loginpage_loginInfo">
$loginhelp<br />	$loginhelp
$forgotpw<br />	$forgotpw
$contactblock<br />	$contactblock
$newuserlink	$newuserlink
$coursecatalog	$coursecatalog
</div>	</div>
</div>	</div>
ENDTOP	ENDTOP
Line 471 $r->print(<<ENDDOCUMENT);	Line 477 $r->print(<<ENDDOCUMENT);
<table border="0" cellspacing="0" cellpadding="0">	<table border="0" cellspacing="0" cellpadding="0">
<tr>	<tr>
<td align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'dom'}: </b></small>	<small><b>$lt{'dom'}: </b></small>
</td>	</td>
<td align="left" valign="top">	<td align="left" valign="top">
<small><tt> $domain</tt></small>	<small><tt> $domain</tt></small>
Line 479 $r->print(<<ENDDOCUMENT);	Line 485 $r->print(<<ENDDOCUMENT);
</tr>	</tr>
<tr>	<tr>
<td align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'serv'}: </b></small>	<small><b>$lt{'serv'}: </b></small>
</td>	</td>
<td align="left" valign="top">	<td align="left" valign="top">
<small><tt> $lonhost ($role)</tt></small>	<small><tt> $lonhost ($role)</tt></small>
Line 487 $r->print(<<ENDDOCUMENT);	Line 493 $r->print(<<ENDDOCUMENT);
</tr>	</tr>
<tr>	<tr>
<td align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'load'}: </b></small>	<small><b>$lt{'load'}: </b></small>
</td>	</td>
<td align="left" valign="top">	<td align="left" valign="top">
<small><tt> $loadpercent $lt{'perc'}</tt></small>	<small><tt> $loadpercent $lt{'perc'}</tt></small>
Line 495 $r->print(<<ENDDOCUMENT);	Line 501 $r->print(<<ENDDOCUMENT);
</tr>	</tr>
<tr>	<tr>
<td align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'userload'}: </b></small>	<small><b>$lt{'userload'}: </b></small>
</td>	</td>
<td align="left" valign="top">	<td align="left" valign="top">
<small><tt> $userloadpercent $lt{'perc'}</tt></small>	<small><tt> $userloadpercent $lt{'perc'}</tt></small>
</td>	</td>
</tr>	</tr>
	<tr>
	<td colspan="2" align="left">
	<small>$version</small>
	</td>
	</tr>
</table>	</table>
</div>	</div>

Line 533 sub redirect_page {	Line 544 sub redirect_page {
}	}

sub contactdisplay {	sub contactdisplay {
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;	my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_;
my $contactblock;	my $contactblock;
my $showhelpdesk = 0;	my $showhelpdesk = 0;
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};	my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
Line 541 sub contactdisplay {	Line 552 sub contactdisplay {
$showhelpdesk = 1;	$showhelpdesk = 1;
}	}
if ($servadm && $showadminmail) {	if ($servadm && $showadminmail) {
$contactblock .= '<b>   '.$$lt{'servadm'}.':</b><br />'.	$contactblock .= $$lt{'servadm'}.':<br />'.
'<tt>      '.$servadm.'</tt><br /> <br />';	'<tt>'.$servadm.'</tt><br />';
}	}
if ($showhelpdesk) {	if ($showhelpdesk) {
$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';	$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
Line 563 function helpdesk() {	Line 574 function helpdesk() {
</script>	</script>
ENDSCRIPT	ENDSCRIPT
}	}
$contactblock .= <<"ENDBLOCK";
$version
ENDBLOCK
return $contactblock;	return $contactblock;
}	}

Line 582 sub loginhelpdisplay {	Line 590 sub loginhelpdisplay {
my (%lt) = @_;	my (%lt) = @_;
my $login_help = 1;	my $login_help = 1;
if ($login_help) {	if ($login_help) {
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';	my $dom = &Apache::lonnet::default_login_domain();
	my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
	my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
	if ($loginhelp_url ne '') {
	return '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>';
	} else {
	return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>';
	}
}	}
return;	return;
}	}
Line 596 END	Line 611 END

sub newuser_link {	sub newuser_link {
my ($linkname) = @_;	my ($linkname) = @_;
return '   <a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';	return '<a href="/adm/createaccount">'.$linkname.'</a>';
}	}

1;	1;

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

Removed from v.1.127
changed lines
	Added in v.1.132