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.111 and 1.117

version 1.111, 2008/12/10 10:14:55	version 1.117, 2009/04/01 14:43:19
Line 84 sub handler {	Line 84 sub handler {
$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]logout[_4].',	.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'	'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'	.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
.$end_page	.$end_page
Line 102 sub handler {	Line 102 sub handler {
# ----------------------------------------------------------- Process Interface	# ----------------------------------------------------------- Process Interface
$env{'form.interface'}=~s/\W//g;	$env{'form.interface'}=~s/\W//g;

# my $textbrowsers=$r->dir_config('lonTextBrowsers');
my $httpbrowser=$ENV{"HTTP_USER_AGENT"};	my $httpbrowser=$ENV{"HTTP_USER_AGENT"};

# foreach (split(/\:/,$textbrowsers)) {
# if ($httpbrowser=~/$_/i) {
# $env{'form.interface'}='textual';
# }
# }

my $fullgraph=($env{'form.interface'} ne 'textual');	my $fullgraph=($env{'form.interface'} ne 'textual');

my $iconpath=	my $iconpath=
Line 253 my $vlink=	Line 246 my $vlink=
my $alink=&Apache::loncommon::designparm('login.alink',$domain);	my $alink=&Apache::loncommon::designparm('login.alink',$domain);
my $mainbg=	my $mainbg=
($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');	($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
my $textcol =
($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
my $bgcol =
($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
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=&Apache::loncommon::domainlogo($domain);
Line 281 my $shownewuserlink =	Line 270 my $shownewuserlink =
my $now=time;	my $now=time;
my $js = (<<ENDSCRIPT);	my $js = (<<ENDSCRIPT);

<script language="JavaScript">	<script type="text/javascript" language="JavaScript">
function send()	function send()
{	{
this.document.server.elements.uname.value	this.document.server.elements.uname.value
Line 382 if (($showcoursecat eq '') \|\| ($showcour	Line 371 if (($showcoursecat eq '') \|\| ($showcour
}	}
my $newuserlink;	my $newuserlink;
if ($shownewuserlink) {	if ($shownewuserlink) {
$newuserlink = &newuser_link($lt{'newuser'});	$newuserlink = &newuser_link($lt{'newuser'}).'<br />';
}	}
my $logintitle;	my $logintitle;
if ($loginheader eq 'text') {	if ($loginheader eq 'text') {
$logintitle = $lt{'log'};	$logintitle ='<h2>'.$lt{'log'}.'</h2>';
} else {	} else {
$logintitle = '<img src="'.$login.'" alt="'.	$logintitle = '<img src="'.$login.'" alt="'.
&mt('User Authentication').'" />';	&mt('User Authentication').'" />';
Line 401 my $contactblock = &contactdisplay(\%lt,	Line 390 my $contactblock = &contactdisplay(\%lt,

my $loginform=(<<LFORM);	my $loginform=(<<LFORM);
<form name="client" onsubmit="return(send())">	<form name="client" 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="10" value="$authusername" /><br />	<input type="text" name="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="10" /><br />	<input type="password" name="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="10" value="$authdomain" /><br />	<input type="text" name="udom" size="15" value="$authdomain" /><br />
<input type="submit" value="$lt{'log'}" />	<input type="submit" value="$lt{'log'}" />
</form>	</form>
LFORM	LFORM
Line 420 if ($fullgraph) {	Line 409 if ($fullgraph) {
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">	<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
<tr>	<tr>
<td align="left" valign="top" bgcolor="$pgbg">	<td align="left" valign="top" bgcolor="$pgbg">
<img src="$img" border=0 alt="The Learning Online Network with CAPA" />	<img src="$img" border="0" alt="The Learning Online Network with CAPA" />
</td>	</td>
</tr>	</tr>
</table>	</table>
Line 431 HEADER	Line 420 HEADER
' <img src="'.$logo.'" alt="" />'."\n");	' <img src="'.$logo.'" alt="" />'."\n");
}	}
$r->print(<<ENDTOP);	$r->print(<<ENDTOP);
	<div class="LC_loginpage_loginDomain">$domainlogo</div>
<div class="LC_loginpage_loginContainer">	<div class="LC_loginpage_loginContainer">
<fieldset class="LC_loginpage_fieldset">	$logintitle
<legend class="LC_loginpage_legend">$logintitle</legend>	<table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
<table border="0" align="left" cellspacing="1" cellpadding="1" width="100%">
<tr>	<tr>
<td width="50%" align="center" valign="top">
$domainlogo
</td>
<td>	<td>
$loginform	$loginform
</td>	</td>
</tr>	</tr>
</table>	</table>
$noscript_warning	$noscript_warning
</fieldset>
</div>	</div>

<div class="LC_loginpage_loginInfo">	<div class="LC_loginpage_loginInfo">
$loginhelp<br />	$loginhelp<br />
$forgotpw<br /><br />	$forgotpw<br />
$newuserlink<br />	$contactblock<br />
	$newuserlink
$coursecatalog<br /><br />	$coursecatalog<br /><br />
<a href="/adm/about.html"><b>$lt{'about'}</b></a><br/>	<a href="/adm/about.html"><b>$lt{'about'}</b></a>
$contactblock
</div>	</div>

<div class="LC_loginpage_space"> </div>	<div class="LC_loginpage_space"> </div>
Line 466 if($announcements){$r->print('<div class	Line 451 if($announcements){$r->print('<div class

if ($fullgraph) {	if ($fullgraph) {
$r->print(<<ENDDOCUMENT);	$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>
Line 528 sub contactdisplay {	Line 513 sub contactdisplay {
'<tt>      '.$servadm.'</tt><br /> <br />';	'<tt>      '.$servadm.'</tt><br /> <br />';
}	}
if ($showhelpdesk) {	if ($showhelpdesk) {
$contactblock .= '<b><a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a></b><br />';	$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
my $thisurl = &escape('/adm/login');	my $thisurl = &escape('/adm/login');
$$helpdeskscript = <<"ENDSCRIPT";	$$helpdeskscript = <<"ENDSCRIPT";
<script type="text/javascript">	<script type="text/javascript">

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

Removed from v.1.111
changed lines
	Added in v.1.117