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.44.2.2 and 1.54

version 1.44.2.2, 2003/08/26 19:48:41	version 1.54, 2003/09/21 20:06:36
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;
$r->content_type('text/html');
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
	&Apache::lonlocal::get_language_handle($r);
	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
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']);


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

Line 113 sub handler {	Line 123 sub handler {
if ($unloaded) { $otherserver=$unloaded; }	if ($unloaded) { $otherserver=$unloaded; }
}	}

	# ----------------------------------------------------------- Get announcements
	my $announcements=&Apache::lonnet::getannounce();
# -------------------------------------------------------- Set login parameters	# -------------------------------------------------------- Set login parameters

my @hexstr=('0','1','2','3','4','5','6','7',	my @hexstr=('0','1','2','3','4','5','6','7',
Line 168 ENDTROUBLE	Line 180 ENDTROUBLE

# ----------------------------------------------- Apparently we are in business	# ----------------------------------------------- Apparently we are in business

my $domainlogo=&Apache::loncommon::domainlogo();	my $domainlogo=&Apache::loncommon::domainlogo($domain);
$servadm=~s/\,/\<br \/\>/g;	$servadm=~s/\,/\<br \/\>/g;
$sysadm=~s/\,/\<br \/\>/g;	$sysadm=~s/\,/\<br \/\>/g;

Line 203 ENDHEADER	Line 215 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',
	'load' => 'Load',
	'userload' => 'User Load',
	'about' => 'aboutlon.gif',
	'access' => 'accessbutton.gif',
	'auth' => 'userauthentication.gif',
	'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 301 ENDSERVERFORM	Line 331 ENDSERVERFORM
<!-- A cell that will hold the 'access' and 'about' buttons -->	<!-- A cell that will hold the 'access' and 'about' buttons -->
<!-- Row 3 Column 1 -->	<!-- Row 3 Column 1 -->
<td valign="top" height=60 align="center" bgcolor="$sidebg">	<td valign="top" height=60 align="center" bgcolor="$sidebg">
<a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 alt="Accessibility Options" /></a>	<a href="/adm/login?interface=textual"><img src="$iconpath/$lt{'access'}" border=0 alt="Accessibility Options" /></a>
<br />	<br />
<a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 alt="About LON-CAPA" /></a>	<a href="/adm/about.html"><img src="$iconpath/$lt{'about'}" border=0 alt="About LON-CAPA" /></a>
</td>	</td>

<!-- The shaded space between the two main columns -->	<!-- The shaded space between the two main columns -->
Line 312 ENDSERVERFORM	Line 342 ENDSERVERFORM

<!-- The right main column holding the large LON-CAPA logo-->	<!-- The right main column holding the large LON-CAPA logo-->
<!-- Rows 3-4 Column 3 -->	<!-- Rows 3-4 Column 3 -->
<td align="center" valign="top" width="100%" height="100%" rowspan=2 bgcolor="$mainbg">	<td align="center" valign="top" width="100%" height="100%" bgcolor="$mainbg">
<center>	<center>
<img src="$logo" alt="" />	<img src="$logo" alt="" />
</center>	</center>
Line 328 ENDSERVERFORM	Line 358 ENDSERVERFORM
<td align="center" valign="middle" bgcolor="$sidebg">	<td align="center" valign="middle" bgcolor="$sidebg">
ENDTOP	ENDTOP
} else {	} else {
$r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>');	$r->print('<h1>The Learning<i>Online</i> Network with CAPA</h1><h2>Text-based Interface Login</h2>'.$announcements);
}	}
$r->print('<form name="client" onsubmit="return(send())">');	$r->print('<form name="client" onsubmit="return(send())">');
unless ($fullgraph) {	unless ($fullgraph) {
Line 360 ENDNOOPT	Line 390 ENDNOOPT

<!-- Start the sub-table for text and input alignment -->	<!-- Start the sub-table for text and input alignment -->
<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/$lt{'auth'}" 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 391 ENDLOGIN	Line 421 ENDLOGIN
<!-- Row 4 Column 2 -->	<!-- Row 4 Column 2 -->
<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>	<td width=27 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>

	<!-- Row 4 Column 3 -->
	<td bgcolor="$mainbg">$announcements</td>

<!-- Row 4 Column 4 -->	<!-- Row 4 Column 4 -->
<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>	<td width=27 background="$iconpath/fillright.gif"><img src="$iconpath/fillright.gif" alt="" /></td>
</tr>	</tr>
Line 402 ENDLOGIN	Line 435 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 410 ENDLOGIN	Line 443 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 418 ENDLOGIN	Line 451 ENDLOGIN
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$sidebg" align="left" valign="top">	<td bgcolor="$sidebg" align="left" valign="top">
<small><b>   Load: </b></small>	<small><b>   $lt{'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{'userload'}: </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.44.2.2
changed lines
	Added in v.1.54