--- loncom/auth/lonlogin.pm 2007/03/02 23:17:48 1.88
+++ loncom/auth/lonlogin.pm 2007/10/09 16:48:51 1.94.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.88 2007/03/02 23:17:48 albertel Exp $
+# $Id: lonlogin.pm,v 1.94.2.1 2007/10/09 16:48:51 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,19 +120,18 @@ ENDFAILED
}
my $fullgraph=($env{'form.interface'} ne 'textual');
- my $port_to_use=$r->dir_config('lonhttpdPort');
- if (!defined($port_to_use)) {
- $port_to_use='8080';
- }
- my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
- $r->dir_config('lonIconsURL');
+
+ my $iconpath=
+ &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+
my $domain = &Apache::lonnet::default_login_domain();
if (($env{'form.domain'}) &&
- ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
+ (&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$env{'form.domain'};
}
my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');
+ my $servadm = $r->dir_config('lonAdmEMail');
my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');
@@ -159,9 +158,8 @@ ENDFAILED
my $otherserver= &Apache::lonnet::absolute_url($host_name);
my $firsturl=
($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
-# ---------------------------------------- Are we access server and overloaded?
- if (($role eq 'access') &&
- (($userloadpercent>100.0)||($loadpercent>100.0))) {
+# ---------------------------------------------------------- Are we overloaded?
+ if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
if ($unloaded) { $otherserver=$unloaded; }
}
@@ -245,8 +243,7 @@ ENDTROUBLE
}
# ----------------------------------------------- Apparently we are in business
-
- my $domainlogo=&Apache::loncommon::domainlogo($domain);
+ $servadm=~s/\,/\
/g;
# --------------------------------------------------- Print login screen header
$r->print(< 'Log in',
'help' => 'Log-in Help',
'serv' => 'Server',
+ 'servadm' => 'Server Administration',
'helpdesk' => 'Contact Helpdesk',
'forgotpw' => 'Forgot password?');
# -------------------------------------------------- Change password field name
@@ -379,6 +382,10 @@ ENDSCRIPT
ENDSERVERFORM
+ my $coursecatalog;
+ if (($showcoursecat eq '') || ($showcoursecat)) {
+ $coursecatalog = &coursecatalog_link($lt{'catalog'});
+ }
if ($fullgraph) { $r->print(<
@@ -415,11 +422,7 @@ ENDSERVERFORM
|
$lt{'about'} |
-
-
- |
- $lt{'catalog'} |
-
+ $coursecatalog
|
@@ -478,15 +481,15 @@ ENDNOOPT
|
- $lt{'un'}: |
+ : |
|
- $lt{'pw'}: |
+ : |
|
- $lt{'dom'}: |
+ : |
|
@@ -508,7 +511,8 @@ ENDNOOPT
ENDLOGIN
if ($fullgraph) {
my $helpdeskscript;
- my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
+ my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
+ $version,$authdomain,\$helpdeskscript);
$r->print(<
@@ -604,13 +608,17 @@ ENDDOCUMENT
}
sub contactdisplay {
- my ($lt,$version,$authdomain,$helpdeskscript) = @_;
+ my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
my $contactblock;
my $showhelpdesk = 0;
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
$showhelpdesk = 1;
}
+ if ($servadm && $showadminmail) {
+ $contactblock .= ' '.$$lt{'servadm'}.':
'.
+ ' '.$servadm.'
';
+ }
if ($showhelpdesk) {
$contactblock .= ' '.$lt->{'helpdesk'}.'
';
my $thisurl = &escape('/adm/login');
@@ -652,5 +660,15 @@ sub loginhelpdisplay {
return;
}
+sub coursecatalog_link {
+ my ($linkname) = @_;
+ return <<"END";
+
+ |
+ $linkname |
+
+END
+}
+
1;
__END__