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.57 and 1.61

version 1.57, 2004/05/07 14:25:17	version 1.61, 2004/12/18 23:58:34
Line 179 ENDFAILED	Line 179 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 256 my %lt=&Apache::lonlocal::texthash(	Line 263 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 440 ENDNOOPT	Line 447 ENDNOOPT
</form>	</form>
ENDLOGIN	ENDLOGIN
if ($fullgraph) {	if ($fullgraph) {
	my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version);
$r->print(<<ENDDOCUMENT);	$r->print(<<ENDDOCUMENT);
</td>	</td>

Line 492 ENDLOGIN	Line 500 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 528 $domainlogo	Line 530 $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>

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

	sub contactdisplay {
	my ($lt,$sysadm,$servadm,$version) = @_;
	my $contactblock;
	my $showsysadm = 1;
	my $showservadm = 1;
	my $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="/adm/helpdesk?origurl='.&Apache::lonnet::escape('/adm/login').'">'.$$lt{'helpdesk'}.'</a></b><br />';
	}
	$contactblock .= <<"ENDBLOCK";
	$version
	ENDBLOCK
	return $contactblock;
	}


1;	1;
__END__	__END__

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

Removed from v.1.57
changed lines
	Added in v.1.61