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.74 and 1.82

version 1.74, 2006/04/05 22:39:55	version 1.82, 2006/11/01 21:27:50
Line 37 use Apache::loncommon();	Line 37 use Apache::loncommon();
use Apache::lonauth();	use Apache::lonauth();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::migrateuser();	use Apache::migrateuser();
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


	sub additional_machine_domains {
	my @domains;
	open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab');
	while( my $line = <$fh>) {
	$line =~ s/\s//g;
	push(@domains,$line);
	}
	return @domains;
	}

sub handler {	sub handler {
my $r = shift;	my $r = shift;

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

Line 126 ENDFAILED	Line 140 ENDFAILED
$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];	my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
foreach my $posdom (&Apache::lonnet::current_machine_domains()) {	foreach my $posdom (&Apache::lonnet::current_machine_domains(),
	&additional_machine_domains()) {
if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }	if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
}	}
if (($env{'form.domain'}) &&	if (($env{'form.domain'}) &&
Line 135 ENDFAILED	Line 150 ENDFAILED
}	}
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 $sysadm = $r->dir_config('lonSysEMail');
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 $expire = $r->dir_config('lonExpire');
my $version = $r->dir_config('lonVersion');	my $version = $r->dir_config('lonVersion');
	my $host_name = $Apache::lonnet::hostname{$lonhost};

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

Line 159 ENDFAILED	Line 173 ENDFAILED
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= &Apache::lonnet::absolute_url($host_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?
Line 238 ENDFAILED	Line 252 ENDFAILED
<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />	<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
<h3>This LON-CAPA server is temporarily not available for login</h3>	<h3>This LON-CAPA server is temporarily not available for login</h3>
<p>Please attempt to login to one of the following servers:</p>$spares	<p>Please attempt to login to one of the following servers:</p>$spares
<p>If the problem persists, please contact <tt>$servadm</tt>.</p>
</body>	</body>
</html>	</html>
ENDTROUBLE	ENDTROUBLE
Line 248 ENDTROUBLE	Line 261 ENDTROUBLE
# ----------------------------------------------- Apparently we are in business	# ----------------------------------------------- Apparently we are in business

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

# --------------------------------------------------- Print login screen header	# --------------------------------------------------- Print login screen header
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
Line 297 my %lt=&Apache::lonlocal::texthash(	Line 308 my %lt=&Apache::lonlocal::texthash(
'log' => 'Log in',	'log' => 'Log in',
'help' => 'Help',	'help' => 'Help',
'serv' => 'Server',	'serv' => 'Server',
'servadm' => 'Server Administration',
'sysadm' => 'System Administration',
'helpdesk' => 'Contact Helpdesk');	'helpdesk' => 'Contact Helpdesk');
# -------------------------------------------------- Change password field name	# -------------------------------------------------- Change password field name
my $now=time;	my $now=time;
Line 446 ENDTOP	Line 455 ENDTOP
<label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />	<label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
<label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />	<label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
<label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />	<label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
<p>If you have accessibility needs that are not addressed by this interface,
please
contact the system administrator at <tt>$sysadm</tt>.</p><br />
<input type="checkbox" name="remember" /> Remember these settings for next login<hr />	<input type="checkbox" name="remember" /> Remember these settings for next login<hr />
ENDACCESSOPTIONS	ENDACCESSOPTIONS
} else {	} else {
Line 493 ENDNOOPT	Line 499 ENDNOOPT
ENDLOGIN	ENDLOGIN
if ($fullgraph) {	if ($fullgraph) {
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);	my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
$r->print(<<ENDDOCUMENT);	$r->print(<<ENDDOCUMENT);
</td>	</td>

Line 589 ENDDOCUMENT	Line 595 ENDDOCUMENT
}	}

sub contactdisplay {	sub contactdisplay {
my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;	my ($lt,$version,$authdomain,$helpdeskscript) = @_;
my $contactblock;	my $contactblock;
my $showsysadm = 1;
my $showservadm = 1;
my $showhelpdesk = 0;	my $showhelpdesk = 0;
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};	my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {	if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
$showhelpdesk = 1;	$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) {	if ($showhelpdesk) {
$contactblock .= '<b>   <a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';	$contactblock .= '<b>   <a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
my $thisurl = &Apache::lonnet::escape('/adm/login');	my $thisurl = &escape('/adm/login');
$$helpdeskscript = <<"ENDSCRIPT";	$$helpdeskscript = <<"ENDSCRIPT";
<script type="text/javascript">	<script type="text/javascript">
function helpdesk() {	function helpdesk() {

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

Removed from v.1.74
changed lines
	Added in v.1.82