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.48 and 1.51

version 1.48, 2003/09/02 22:28:19	version 1.51, 2003/09/17 02:24:14
Line 40 use Apache::Constants qw(:common);	Line 40 use Apache::Constants qw(:common);
use Apache::File ();	use Apache::File ();
use Apache::lonnet();	use Apache::lonnet();
use Apache::loncommon();	use Apache::loncommon();
	use Apache::lonauth();
	use Apache::lonlocal;

sub handler {	sub handler {
my $r = shift;	my $r = shift;
Line 49 sub handler {	Line 51 sub handler {
return OK if $r->header_only;	return OK if $r->header_only;


	# Are we re-routing?
	if (-e '/home/httpd/html/lon-status/reroute.txt') {
	&Apache::lonauth::reroute($r);
	return OK;
	}

&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},	($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
['interface','username','domain','firsturl','localpath','localres']);	['interface','username','domain','firsturl','localpath','localres']);

	# -------------------------------------------------------------------- Language

	&Apache::lonlocal::get_language_handle();

# ----------------------------------------------------------- Process Interface	# ----------------------------------------------------------- Process Interface
$ENV{'form.interface'}=~s/\W//g;	$ENV{'form.interface'}=~s/\W//g;

Line 205 ENDHEADER	Line 217 ENDHEADER
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);

	# ----------------------------------------------------------------------- Texts

	my %lt=&Apache::lonlocal::texthash(
	'un' => 'Username',
	'pw' => 'Password',
	'dom' => 'Domain',
	'perc' => 'percent',
	'user' => 'User',
	'load' => 'load',
	'log' => 'Log in',
	'help' => 'Help',
	'serv' => 'Server',
	'servadm' => 'Server Administration',
	'sysadm' => 'System Administration');


# ---------------------------------------------------------- Serve rest of page	# ---------------------------------------------------------- Serve rest of page
$r->print(<<ENDSCRIPT);	$r->print(<<ENDSCRIPT);
Line 364 ENDNOOPT	Line 391 ENDNOOPT
<table border=0 cellspacing=0 cellpadding=0>	<table border=0 cellspacing=0 cellpadding=0>
<tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>	<tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/userauthentication.gif" alt="User Authentication" /></td></tr>
<tr>	<tr>
<td bgcolor="$mainbg"><br /><font size=-1><b>   User Name:</b></font></td>	<td bgcolor="$mainbg"><br /><font size=-1><b>   $lt{'un'}:</b></font></td>
<td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>	<td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$mainbg"><font size=-1><b>   Password:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   $lt{'pw'}:</b></font></td>
<td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>	<td bgcolor="$mainbg"><input type="password" name="upass" size="10" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$mainbg"><font size=-1><b>   Domain:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   $lt{'dom'}:</b></font></td>
<td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>	<td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$mainbg">   <a href="/adm/loginproblems.html">Help</a></td>	<td bgcolor="$mainbg">   <a href="/adm/loginproblems.html">$lt{'help'}</a></td>
<td bgcolor="$mainbg" valign="bottom" align="center">	<td bgcolor="$mainbg" valign="bottom" align="center">
<br />	<br />
<input type="submit" value="Log In" />	<input type="submit" value="$lt{'log'}" />
</td>	</td>
</tr>	</tr>
</table>	</table>
Line 407 ENDLOGIN	Line 434 ENDLOGIN
<table border=0 cellspacing=0 cellpadding=0>	<table border=0 cellspacing=0 cellpadding=0>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Domain: </b></small>	<small><b>   $lt{'dom'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $domain</tt></small>	<small><tt> $domain</tt></small>
Line 415 ENDLOGIN	Line 442 ENDLOGIN
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Server: </b></small>	<small><b>   $lt{'serv'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $lonhost ($role)</tt></small>	<small><tt> $lonhost ($role)</tt></small>
Line 426 ENDLOGIN	Line 453 ENDLOGIN
<small><b>   Load: </b></small>	<small><b>   Load: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $loadpercent percent</tt></small>	<small><tt> $loadpercent $lt{'perc'}</tt></small>
</td>	</td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   User Load: </b></small>	<small><b>   $lt{'user'} $lt{'load'}: </b></small>
</td>	</td>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><tt> $userloadpercent percent</tt></small>	<small><tt> $userloadpercent $lt{'perc'}</tt></small>
</td>	</td>
</tr>	</tr>
</table>	</table>
<br />	<br />
<small>	<small>
<b>   System Administration:</b><br />	<b>   $lt{'sysadm'}:</b><br />
<tt>      $sysadm</tt><br />	<tt>      $sysadm</tt><br />
<b>   Server Administration:</b><br />	<b>   $lt{'servadm'}:</b><br />
<tt>      $servadm</tt><br /> <br />	<tt>      $servadm</tt><br /> <br />
$version	$version
</small>	</small>

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

Removed from v.1.48
changed lines
	Added in v.1.51