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.87 and 1.94

version 1.87, 2007/01/14 02:00:04	version 1.94, 2007/08/30 22:07:45
Line 120 ENDFAILED	Line 120 ENDFAILED
}	}

my $fullgraph=($env{'form.interface'} ne 'textual');	my $fullgraph=($env{'form.interface'} ne 'textual');
my $port_to_use=$r->dir_config('lonhttpdPort');
if (!defined($port_to_use)) {	my $iconpath=
$port_to_use='8080';	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
}
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');
my $domain = &Apache::lonnet::default_login_domain();	my $domain = &Apache::lonnet::default_login_domain();
if (($env{'form.domain'}) &&	if (($env{'form.domain'}) &&
($Apache::lonnet::domaindescription{$env{'form.domain'}})) {	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$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 $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};	my $host_name = &Apache::lonnet::hostname($lonhost);

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

Line 200 ENDFAILED	Line 199 ENDFAILED
my $last;	my $last;
foreach my $hostid (sort	foreach my $hostid (sort
{	{
$Apache::lonnet::hostname{$a} cmp	&Apache::lonnet::hostname($a) cmp
$Apache::lonnet::hostname{$b};	&Apache::lonnet::hostname($b);
}	}
keys(%Apache::lonnet::spareid)) {	keys(%Apache::lonnet::spareid)) {
next if ($hostid eq $lonhost);	next if ($hostid eq $lonhost);
next if ($last eq $Apache::lonnet::hostname{$hostid});	my $hostname = &Apache::lonnet::hostname($hostid);
	next if ($last eq $hostname);
$spares.='<br /><font size="+1"><a href="http://'.	$spares.='<br /><font size="+1"><a href="http://'.
$Apache::lonnet::hostname{$hostid}.	$hostname.
'/adm/login?domain='.$authdomain.'">'.	'/adm/login?domain='.$authdomain.'">'.
$Apache::lonnet::hostname{$hostid}.'</a>'.	$hostname.'</a>'.
' (preferred)</font>'.$/;	' (preferred)</font>'.$/;
$last=$Apache::lonnet::hostname{$hostid};	$last=$hostname;
}	}
$spares.= '<br />';	$spares.= '<br />';
	my %all_hostnames = &Apache::lonnet::all_hostnames();
foreach my $hostid (sort	foreach my $hostid (sort
{	{
$Apache::lonnet::hostname{$a} cmp	&Apache::lonnet::hostname($a) cmp
$Apache::lonnet::hostname{$b};	&Apache::lonnet::hostname($b);
}	}
keys(%Apache::lonnet::hostname)) {	keys(%all_hostnames)) {
next if ($hostid eq $lonhost \|\| $Apache::lonnet::spareid{$hostid});	next if ($hostid eq $lonhost \|\| $Apache::lonnet::spareid{$hostid});
next if ($last eq $Apache::lonnet::hostname{$hostid});	my $hostname = &Apache::lonnet::hostname($hostid);
	next if ($last eq $hostname);
$spares.='<br /><a href="http://'.	$spares.='<br /><a href="http://'.
$Apache::lonnet::hostname{$hostid}.	$hostname.
'/adm/login?domain='.$authdomain.'">'.	'/adm/login?domain='.$authdomain.'">'.
$Apache::lonnet::hostname{$hostid}.'</a>';	$hostname.'</a>';
$last=$Apache::lonnet::hostname{$hostid};	$last=$hostname;
}	}
$r->print(<<ENDTROUBLE);	$r->print(<<ENDTROUBLE);
<html>	<html>
Line 242 ENDTROUBLE	Line 244 ENDTROUBLE
}	}

# ----------------------------------------------- Apparently we are in business	# ----------------------------------------------- Apparently we are in business
	$servadm=~s/\,/\<br \/\>/g;
my $domainlogo=&Apache::loncommon::domainlogo($domain);

# --------------------------------------------------- Print login screen header	# --------------------------------------------------- Print login screen header
$r->print(<<ENDHEADER);	$r->print(<<ENDHEADER);
Line 275 ENDHEADER	Line 276 ENDHEADER
($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');	($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
my $logo=&Apache::loncommon::designparm('login.logo',$domain);	my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);	my $img=&Apache::loncommon::designparm('login.img',$domain);
	my $domainlogo=&Apache::loncommon::domainlogo($domain);
	my $showadminmail=&Apache::loncommon::designparm('login.adminmail', $domain);
	my $showcoursecat =
	&Apache::loncommon::designparm('login.coursecatalog',$domain);


# ----------------------------------------------------------------------- Texts	# ----------------------------------------------------------------------- Texts

Line 292 my %lt=&Apache::lonlocal::texthash(	Line 298 my %lt=&Apache::lonlocal::texthash(
'log' => 'Log in',	'log' => 'Log in',
'help' => 'Log-in Help',	'help' => 'Log-in Help',
'serv' => 'Server',	'serv' => 'Server',
	'servadm' => 'Server Administration',
'helpdesk' => 'Contact Helpdesk',	'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot password?');	'forgotpw' => 'Forgot password?');
# -------------------------------------------------- Change password field name	# -------------------------------------------------- Change password field name
Line 376 ENDSCRIPT	Line 383 ENDSCRIPT
<input type="hidden" name="localres" value="$env{'form.localres'}" />	<input type="hidden" name="localres" value="$env{'form.localres'}" />
</form>	</form>
ENDSERVERFORM	ENDSERVERFORM
	my $coursecatalog;
	if (($showcoursecat eq '') \|\| ($showcoursecat)) {
	$coursecatalog = &coursecatalog_link($lt{'catalog'});
	}
if ($fullgraph) { $r->print(<<ENDTOP);	if ($fullgraph) { $r->print(<<ENDTOP);
<!-- The LON-CAPA Header -->	<!-- The LON-CAPA Header -->
<tr>	<tr>
Line 412 ENDSERVERFORM	Line 423 ENDSERVERFORM
<tr>	<tr>
<td> </td>	<td> </td>
<td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>	<td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
</tr>	</tr>$coursecatalog
<tr>
<td> </td>
<td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td>
</tr>
<tr>	<tr>
<td colspan="2"> </td>	<td colspan="2"> </td>
</tr>	</tr>
Line 475 ENDNOOPT	Line 482 ENDNOOPT
<table border=0 cellspacing=0 cellpadding=0>	<table border=0 cellspacing=0 cellpadding=0>
<tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>	<tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>
<tr>	<tr>
<td bgcolor="$mainbg"><br /><font size=-1><b>   $lt{'un'}:</b></font></td>	<td bgcolor="$mainbg"><br /><font size=-1><b>   <label for="uname">$lt{'un'}</label>:</b></font></td>
<td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>	<td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$mainbg"><font size=-1><b>   $lt{'pw'}:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   <label for="upass$now">$lt{'pw'}</label>:</b></font></td>
<td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>	<td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="$mainbg"><font size=-1><b>   $lt{'dom'}:</b></font></td>	<td bgcolor="$mainbg"><font size=-1><b>   <label for="udom">$lt{'dom'}</label>:</b></font></td>
<td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>	<td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
</tr>	</tr>
<tr>	<tr>
Line 505 ENDNOOPT	Line 512 ENDNOOPT
ENDLOGIN	ENDLOGIN
if ($fullgraph) {	if ($fullgraph) {
my $helpdeskscript;	my $helpdeskscript;
my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);	my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
	$version,$authdomain,\$helpdeskscript);
$r->print(<<ENDDOCUMENT);	$r->print(<<ENDDOCUMENT);
</td>	</td>

Line 601 ENDDOCUMENT	Line 609 ENDDOCUMENT
}	}

sub contactdisplay {	sub contactdisplay {
my ($lt,$version,$authdomain,$helpdeskscript) = @_;	my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
my $contactblock;	my $contactblock;
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 ($servadm && $showadminmail) {
	$contactblock .= '<b>   '.$$lt{'servadm'}.':</b><br />'.
	'<tt>      '.$servadm.'</tt><br /> <br />';
	}
if ($showhelpdesk) {	if ($showhelpdesk) {
$contactblock .= '<b>   <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';	$contactblock .= '<b>   <a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';
my $thisurl = &escape('/adm/login');	my $thisurl = &escape('/adm/login');
Line 649 sub loginhelpdisplay {	Line 661 sub loginhelpdisplay {
return;	return;
}	}

	sub coursecatalog_link {
	my ($linkname) = @_;
	return <<"END";
	<tr>
	<td> </td>
	<td><a href="/adm/coursecatalog"><b>$linkname</b></a></td>
	</tr>
	END
	}

1;	1;
__END__	__END__

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

Removed from v.1.87
changed lines
	Added in v.1.94