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.39 and 1.44.2.1

version 1.39, 2003/04/02 14:57:32	version 1.44.2.1, 2003/08/26 19:47:33
Line 51 sub handler {	Line 51 sub handler {

&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']);	['interface','username','domain','firsturl','localpath','localres']);

# ----------------------------------------------------------- Process Interface	# ----------------------------------------------------------- Process Interface
$ENV{'form.interface'}=~s/\W//g;	$ENV{'form.interface'}=~s/\W//g;
Line 66 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');
	if (($ENV{'form.domain'}) &&
	($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
	$domain=$ENV{'form.domain'};
	}
my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');	my $loadlim = $r->dir_config('lonLoadLim');
my $servadm = $r->dir_config('lonAdmEMail');	my $servadm = $r->dir_config('lonAdmEMail');
Line 78 sub handler {	Line 85 sub handler {
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 $expire = $r->dir_config('lonExpire');
	my $version = $r->dir_config('lonVersion');

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

Line 86 sub handler {	Line 94 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);
}	}

# -------------------------------------------------------- Set login parameters	# -------------------------------------------------------- Set login parameters
Line 177 ENDHEADER	Line 187 ENDHEADER

# ----------------------------------------------------------- Front page design	# ----------------------------------------------------------- Front page design
my $pgbg=	my $pgbg=
($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF');	($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
my $font=	my $font=
($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000');	($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
my $link=	my $link=
($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF');	($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
my $vlink=	my $vlink=
($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF');	($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
my $alink=&Apache::loncommon::designparm('login.alink');	my $alink=&Apache::loncommon::designparm('login.alink',$domain);
my $mainbg=	my $mainbg=
($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF');	($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
my $sidebg=	my $sidebg=
($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF');	($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
my $logo=&Apache::loncommon::designparm('login.logo');	my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img');	my $img=&Apache::loncommon::designparm('login.img',$domain);


# ---------------------------------------------------------- Serve rest of page	# ---------------------------------------------------------- Serve rest of page
Line 258 ENDSCRIPT	Line 268 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 411 ENDLOGIN	Line 423 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.39
changed lines
	Added in v.1.44.2.1