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.35 and 1.45

version 1.35, 2003/02/19 14:05:28	version 1.45, 2003/08/12 19:46:04
Line 50 sub handler {	Line 50 sub handler {


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

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

Line 65 sub handler {	Line 66 sub handler {
}	}

my $fullgraph=($ENV{'form.interface'} ne 'textual');	my $fullgraph=($ENV{'form.interface'} ne 'textual');
	my $port_to_use=$r->dir_config('lonhttpdPort');
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.	if (!defined($port_to_use)) {
	$port_to_use='8080';
	}
	my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');	$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
Line 76 sub handler {	Line 80 sub handler {
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');	my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');	my $include = $r->dir_config('lonIncludes');
	my $expire = $r->dir_config('lonExpire');
	my $version = $r->dir_config('lonVersion');

# --------------------------------------------- Default values for login fields	# --------------------------------------------- Default values for login fields

Line 84 sub handler {	Line 90 sub handler {

# ---------------------------------------------------------- Determine own load	# ---------------------------------------------------------- Determine own load
my $loadavg;	my $loadavg;
{	{
my $loadfile=Apache::File->new('/proc/loadavg');	my $loadfile=Apache::File->new('/proc/loadavg');
$loadavg=<$loadfile>;	$loadavg=<$loadfile>;
}	}
$loadavg =~ s/\s.*//g;	$loadavg =~ s/\s.*//g;
my $loadpercent=100*$loadavg/$loadlim;	my $loadpercent=100*$loadavg/$loadlim;
	my $userloadpercent=&Apache::lonnet::userload();

# ------------------------------------------------------- Do the load balancing	# ------------------------------------------------------- Do the load balancing
my $otherserver='http://'.$ENV{'SERVER_NAME'};	my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=	my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});	($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
# ---------------------------------------- Are we access server and overloaded?	# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') && ($loadpercent>100.0)) {	if (($role eq 'access') &&
$otherserver=Apache::lonnet::spareserver($loadpercent);	(($userloadpercent>100.0)\|\|($loadpercent>100.0))) {
	$otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
}	}

	# ----------------------------------------------------------- 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 156 ENDTROUBLE	Line 166 ENDTROUBLE
# ----------------------------------------------- Apparently we are in business	# ----------------------------------------------- Apparently we are in business

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

# --------------------------------------------------- Print login screen header	# --------------------------------------------------- Print login screen header
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
<html>	<html>
<head>	<head>
	<meta HTTP-EQUIV="Refresh" CONTENT="$expire; url=/adm/roles" />
<title>The LearningOnline Network with CAPA Login</title>	<title>The LearningOnline Network with CAPA Login</title>
</head>	</head>
ENDHEADER	ENDHEADER
Line 203 ENDHEADER	Line 217 ENDHEADER
=this.document.client.elements.udom.value;	=this.document.client.elements.udom.value;

this.document.server.elements.imagesuppress.value	this.document.server.elements.imagesuppress.value
=this.document.client.elements.imagesuppress.value;	=this.document.client.elements.imagesuppress.checked;

this.document.server.elements.embedsuppress.value	this.document.server.elements.embedsuppress.value
=this.document.client.elements.embedsuppress.value;	=this.document.client.elements.embedsuppress.checked;

this.document.server.elements.appletsuppress.value	this.document.server.elements.appletsuppress.value
=this.document.client.elements.appletsuppress.value;	=this.document.client.elements.appletsuppress.checked;

this.document.server.elements.fontenhance.value	this.document.server.elements.fontenhance.value
=this.document.client.elements.fontenhance.value;	=this.document.client.elements.fontenhance.checked;

this.document.server.elements.blackwhite.value	this.document.server.elements.blackwhite.value
=this.document.client.elements.blackwhite.value;	=this.document.client.elements.blackwhite.checked;

this.document.server.elements.remember.value	this.document.server.elements.remember.value
=this.document.client.elements.remember.value;	=this.document.client.elements.remember.checked;

uextkey=this.document.client.elements.uextkey.value;	uextkey=this.document.client.elements.uextkey.value;
lextkey=this.document.client.elements.lextkey.value;	lextkey=this.document.client.elements.lextkey.value;
Line 252 ENDSCRIPT	Line 266 ENDSCRIPT
<input type="hidden" name="fontenhance" value="" />	<input type="hidden" name="fontenhance" value="" />
<input type="hidden" name="blackwhite" value="" />	<input type="hidden" name="blackwhite" value="" />
<input type="hidden" name="remember" value="" />	<input type="hidden" name="remember" value="" />
	<input type="hidden" name="localpath" value="$ENV{'form.localpath'}" />
	<input type="hidden" name="localres" value="$ENV{'form.localres'}" />
</form>	</form>
ENDSERVERFORM	ENDSERVERFORM
if ($fullgraph) { $r->print(<<ENDTOP);	if ($fullgraph) { $r->print(<<ENDTOP);
Line 293 ENDSERVERFORM	Line 309 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 309 ENDSERVERFORM	Line 325 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 372 ENDLOGIN	Line 388 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 405 ENDLOGIN	Line 424 ENDLOGIN
<small><tt> $loadpercent percent</tt></small>	<small><tt> $loadpercent percent</tt></small>
</td>	</td>
</tr>	</tr>
	<tr>
	<td bgcolor="$sidebg" align="left" valign="top">
	<small><b>   User Load: </b></small>
	</td>
	<td bgcolor="$sidebg" align="left" valign="top">
	<small><tt> $userloadpercent percent</tt></small>
	</td>
	</tr>
</table>	</table>
<br />	<br />
<small>	<small>
<b>   System Administration:</b><br />	<b>   System Administration:</b><br />
<tt>      $sysadm</tt><br />	<tt>      $sysadm</tt><br />
<b>   Server Administration:</b><br />	<b>   Server Administration:</b><br />
<tt>      $servadm<br /> </tt>	<tt>      $servadm</tt><br /> <br />
	$version
</small>	</small>
</td>	</td>

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

Removed from v.1.35
changed lines
	Added in v.1.45