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.108 and 1.111

version 1.108, 2008/11/23 11:01:01	version 1.111, 2008/12/10 10:14:55
Line 253 my $vlink=	Line 253 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 $sidebg=
($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
my $textcol =	my $textcol =
($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');	($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
my $bgcol =	my $bgcol =
Line 266 my $login=&Apache::loncommon::designparm	Line 264 my $login=&Apache::loncommon::designparm
if ($login eq '') {	if ($login eq '') {
$login = $iconpath.'/'.&mt('userauthentication.gif');	$login = $iconpath.'/'.&mt('userauthentication.gif');
}	}
	my $showbanner = 1;
	my $showmainlogo = 1;
	if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
	$showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain);
	}
	if (defined(&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=&Apache::loncommon::designparm('login.adminmail',$domain);
my $showcoursecat =	my $showcoursecat =
&Apache::loncommon::designparm('login.coursecatalog',$domain);	&Apache::loncommon::designparm('login.coursecatalog',$domain);
Line 340 my %lt=&Apache::lonlocal::texthash(	Line 346 my %lt=&Apache::lonlocal::texthash(
'helpdesk' => 'Contact Helpdesk',	'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot password?',	'forgotpw' => 'Forgot password?',
'newuser' => 'New User?',	'newuser' => 'New User?',
'options_headline' => 'Select Accessibility Options',	);
'sprs_img' => 'Suppress rendering of images',
'sprs_applet' => 'Suppress Java applets',
'sprs_embed' => 'Suppress rendering of embedded multimedia',
'sprs_font' => 'Increase font size',
'sprs_blackwhite' => 'Switch to black and white mode',
'remember' => 'Remember these settings for next login');
# -------------------------------------------------- Change password field name	# -------------------------------------------------- Change password field name
my $forgotpw = &forgotpwdisplay(%lt);	my $forgotpw = &forgotpwdisplay(%lt);
my $loginhelp = &loginhelpdisplay(%lt);	my $loginhelp = &loginhelpdisplay(%lt);
Line 398 my $noscript_warning='<noscript><span cl	Line 398 my $noscript_warning='<noscript><span cl
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,	my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
$version,$authdomain,\$helpdeskscript);	$version,$authdomain,\$helpdeskscript);
my $loncapaheader=(<<HEADER);
<!-- The LON-CAPA Header -->
<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
<tr>
<td align="left" valign="top" bgcolor="$pgbg">
<img src="$img" border=0 alt="The Learning Online Network with CAPA" />
</td>
</tr>
</table>
HEADER

my $loginform=(<<LFORM);	my $loginform=(<<LFORM);
<form name="client" onsubmit="return(send())">	<form name="client" onsubmit="return(send())">
Line 423 my $loginform=(<<LFORM);	Line 413 my $loginform=(<<LFORM);
</form>	</form>
LFORM	LFORM

if ($fullgraph) {	if ($fullgraph) {
$r->print(<<ENDTOP);	if ($showbanner) {
$loncapaheader	$r->print(<<HEADER);
<div class="LC_loginpage_space"> </div>	<!-- The LON-CAPA Header -->
<img src="$logo" alt="" />	<table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
	<tr>
	<td align="left" valign="top" bgcolor="$pgbg">
	<img src="$img" border=0 alt="The Learning Online Network with CAPA" />
	</td>
	</tr>
	</table>
	HEADER
	}
	if ($showmainlogo) {
	$r->print('<div class="LC_loginpage_space"> </div>'."\n".
	' <img src="'.$logo.'" alt="" />'."\n");
	}
	$r->print(<<ENDTOP);
<div class="LC_loginpage_loginContainer">	<div class="LC_loginpage_loginContainer">
<fieldset class="LC_loginpage_fieldset">	<fieldset class="LC_loginpage_fieldset">
<legend class="LC_loginpage_legend">$logintitle</legend>	<legend class="LC_loginpage_legend">$logintitle</legend>
Line 451 $loncapaheader	Line 453 $loncapaheader
$forgotpw<br /><br />	$forgotpw<br /><br />
$newuserlink<br />	$newuserlink<br />
$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><br/>
$helpdeskscript	$contactblock
</div>	</div>

<div class="LC_loginpage_space"> </div>	<div class="LC_loginpage_space"> </div>
Line 466 if ($fullgraph) {	Line 468 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 bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'dom'}: </b></small>	<small><b>   $lt{'dom'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><tt> $domain</tt></small>	<small><tt> $domain</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'serv'}: </b></small>	<small><b>   $lt{'serv'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><tt> $lonhost ($role)</tt></small>	<small><tt> $lonhost ($role)</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'load'}: </b></small>	<small><b>   $lt{'load'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><tt> $loadpercent $lt{'perc'}</tt></small>	<small><tt> $loadpercent $lt{'perc'}</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td align="left" valign="top">
<small><b>   $lt{'userload'}: </b></small>	<small><b>   $lt{'userload'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" 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>
</table>	</table>

$contactblock

</div>	</div>

<script type="text/javascript">	<script type="text/javascript">
Line 529 sub contactdisplay {	Line 528 sub contactdisplay {
'<tt>      '.$servadm.'</tt><br /> <br />';	'<tt>      '.$servadm.'</tt><br /> <br />';
}	}
if ($showhelpdesk) {	if ($showhelpdesk) {
$contactblock .= '<b>   <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';	$contactblock .= '<b><a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a></b><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.108
changed lines
	Added in v.1.111