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.55.2.2 and 1.62.2.1

version 1.55.2.2, 2005/04/28 01:25:08	version 1.62.2.1, 2005/02/21 18:29:25
Line 68 sub handler {	Line 68 sub handler {
<head>	<head>
<title>Already logged in</title>	<title>Already logged in</title>
</head>	</head>
<html>
$bodytag	$bodytag
<h1>You are already logged in</h1>	<h1>You are already logged in</h1>
<p>Please either <a href="/adm/roles">continue the current session</a> or	<p>Please either <a href="/adm/roles">continue the current session</a> or
Line 109 ENDFAILED	Line 108 ENDFAILED
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.	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 $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
foreach my $posdom (values(%Apache::lonnet::hostdom)) {
if (lc($posdom) eq lc($testdomain)) { $domain=$testdomain; }
}
if (($ENV{'form.domain'}) &&	if (($ENV{'form.domain'}) &&
($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {	($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) {
$domain=$ENV{'form.domain'};	$domain=$ENV{'form.domain'};
Line 139 ENDFAILED	Line 134 ENDFAILED
$loadavg=<$loadfile>;	$loadavg=<$loadfile>;
}	}
$loadavg =~ s/\s.*//g;	$loadavg =~ s/\s.*//g;
my $loadpercent=100*$loadavg/$loadlim;	my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
my $userloadpercent=&Apache::lonnet::userload();	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'});
	my $escfirsturl=&Apache::lonnet::escape($firsturl);
# ---------------------------------------- Are we access server and overloaded?	# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') &&	if (($role eq 'access') &&
(($userloadpercent>100.0)\|\|($loadpercent>100.0))) {	(($userloadpercent>100.0)\|\|($loadpercent>100.0))) {
Line 184 ENDFAILED	Line 180 ENDFAILED

if ($logtoken eq 'con_lost') {	if ($logtoken eq 'con_lost') {
my $spares='';	my $spares='';
foreach (keys %Apache::lonnet::hostname) {
if ($_ ne $lonhost) {	foreach my $hostid (keys(%Apache::lonnet::spareid)) {
$spares.='<br /><a href="http://'.$Apache::lonnet::hostname{$_}.	next if ($hostid eq $lonhost);
'/adm/login?domain='.$authdomain.'">'.	$spares.='<br /><font size="+1"><a href="http://'.
$Apache::lonnet::hostname{$_}.'</a>';	$Apache::lonnet::hostname{$hostid}.
if ($Apache::lonnet::spareid{$_}) {	'/adm/login?domain='.$authdomain.'">'.
$spares.=' (preferred)';	$Apache::lonnet::hostname{$hostid}.'</a>'.
}	' (preferred)</font>'.$/;
}	}
	$spares.= '<br />';
	foreach my $hostid (keys(%Apache::lonnet::hostname)) {
	next if ($hostid eq $lonhost \|\| $Apache::lonnet::spareid{$hostid});
	$spares.='<br /><a href="http://'.
	$Apache::lonnet::hostname{$hostid}.
	'/adm/login?domain='.$authdomain.'">'.
	$Apache::lonnet::hostname{$hostid}.'</a>';
}	}
$r->print(<<ENDTROUBLE);	$r->print(<<ENDTROUBLE);
<html>	<html>
Line 261 my %lt=&Apache::lonlocal::texthash(	Line 264 my %lt=&Apache::lonlocal::texthash(
'help' => 'Help',	'help' => 'Help',
'serv' => 'Server',	'serv' => 'Server',
'servadm' => 'Server Administration',	'servadm' => 'Server Administration',
'sysadm' => 'System Administration');	'sysadm' => 'System Administration',
	'helpdesk' => 'Contact Helpdesk');

# ---------------------------------------------------------- Serve rest of page	# ---------------------------------------------------------- Serve rest of page
$r->print(<<ENDSCRIPT);	$r->print(<<ENDSCRIPT);
Line 338 ENDSERVERFORM	Line 341 ENDSERVERFORM
<tr>	<tr>

<!-- Row 1 Columns 2-4 -->	<!-- Row 1 Columns 2-4 -->
<td width="100%" height=75 colspan=4 align="left" valign="top" bgcolor="$pgbg"><img src="$img" border=0 alt="The Learning Online Network with CAPA" /></td>	<td width="100%" colspan=4 bgcolor="$sidebg"><h1><font color="$pgbg">Welcome to the LON-CAPA NSDL Gateway</font></h1><a href="/cgi-bin/signon.pl?$escfirsturl"><h3><font color="$pgbg">Sign up for a Guest Login</font></h3></a></td>
</tr>	</tr>

<!-- The gray bar that starts the two table frames -->	<!-- The gray bar that starts the two table frames -->
Line 445 ENDNOOPT	Line 448 ENDNOOPT
</form>	</form>
ENDLOGIN	ENDLOGIN
if ($fullgraph) {	if ($fullgraph) {
	my $helpdeskscript;
	my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
$r->print(<<ENDDOCUMENT);	$r->print(<<ENDDOCUMENT);
</td>	</td>

Line 497 ENDLOGIN	Line 502 ENDLOGIN
</tr>	</tr>
</table>	</table>
<br />	<br />
<small>	$contactblock
<b>   $lt{'sysadm'}:</b><br />
<tt>      $sysadm</tt><br />
<b>   $lt{'servadm'}:</b><br />
<tt>      $servadm</tt><br /> <br />
$version
</small>
</td>	</td>

<!-- Row 5 Column 2 -->	<!-- Row 5 Column 2 -->
Line 533 $domainlogo	Line 532 $domainlogo
</tr>	</tr>
</table>	</table>

<script>	<script type="text/javascript">
// the if prevents the script error if the browser can't handle this	// the if prevents the script error if the browser can not handle this
if ( document.client.uname ) { document.client.uname.focus(); }	if ( document.client.uname ) { document.client.uname.focus(); }
</script>	</script>
	$helpdeskscript

ENDDOCUMENT	ENDDOCUMENT
}	}
$r->print('</body></html>');	$r->print('</body></html>');
return OK;	return OK;
}	}

	sub contactdisplay {
	my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
	my $contactblock;
	my $showsysadm = 1;
	my $showservadm = 1;
	my $showhelpdesk = 0;
	my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
	if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
	$showhelpdesk = 1;
	}
	if ($showsysadm) {
	$contactblock .= '<b>   '.$$lt{'sysadm'}.':</b><br />'.
	'<tt>      '.$sysadm.'</tt><br />';
	}
	if ($showservadm) {
	$contactblock .= '<b>   '.$$lt{'servadm'}.':</b><br />'.
	'<tt>      '.$servadm.'</tt><br /> <br />';
	}
	if ($showhelpdesk) {
	$contactblock .= '<b>   <a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
	my $thisurl = &Apache::lonnet::escape('/adm/login');
	$$helpdeskscript = <<"ENDSCRIPT";
	<script type="text/javascript">
	function helpdesk() {
	var codedom = document.client.udom.value;
	if (codedom == '') {
	codedom = "$authdomain";
	}
	var querystr = "origurl=$thisurl&codedom="+codedom;
	document.location.href = "/adm/helpdesk?"+querystr;
	return;
	}
	</script>
	ENDSCRIPT
	}
	$contactblock .= <<"ENDBLOCK";
	$version
	ENDBLOCK
	return $contactblock;
	}


1;	1;
__END__	__END__

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

Removed from v.1.55.2.2
changed lines
	Added in v.1.62.2.1