--- loncom/auth/lonlogin.pm 2004/01/27 23:40:31 1.55.2.1 +++ loncom/auth/lonlogin.pm 2005/06/14 20:09:13 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.55.2.1 2004/01/27 23:40:31 albertel Exp $ +# $Id: lonlogin.pm,v 1.67 2005/06/14 20:09:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,7 +32,7 @@ use strict; use Apache::Constants qw(:common); use CGI::Cookie(); use Apache::File (); -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonauth(); use Apache::lonlocal; @@ -68,7 +68,6 @@ sub handler { Already logged in - $bodytag

You are already logged in

Please either continue the current session or @@ -85,23 +84,23 @@ ENDFAILED # ---------------------------------------------------- No valid token, continue &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, + ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, ['interface','username','domain','firsturl','localpath','localres']); # ----------------------------------------------------------- Process Interface - $ENV{'form.interface'}=~s/\W//g; + $env{'form.interface'}=~s/\W//g; my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; foreach (split(/\:/,$textbrowsers)) { if ($httpbrowser=~/$_/i) { - $ENV{'form.interface'}='textual'; + $env{'form.interface'}='textual'; } } - 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)) { $port_to_use='8080'; @@ -109,13 +108,9 @@ ENDFAILED my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); - my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0]; - foreach my $posdom (values(%Apache::lonnet::hostdom)) { - if ($posdom eq $testdomain) { $domain=$testdomain; } - } - if (($ENV{'form.domain'}) && - ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) { - $domain=$ENV{'form.domain'}; + if (($env{'form.domain'}) && + ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { + $domain=$env{'form.domain'}; } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); @@ -129,8 +124,8 @@ ENDFAILED # --------------------------------------------- Default values for login fields - my $authusername=($ENV{'form.username'}?$ENV{'form.username'}:''); - my $authdomain=($ENV{'form.domain'}?$ENV{'form.domain'}:$domain); + my $authusername=($env{'form.username'}?$env{'form.username'}:''); + my $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain); # ---------------------------------------------------------- Determine own load my $loadavg; @@ -139,13 +134,13 @@ ENDFAILED $loadavg=<$loadfile>; } $loadavg =~ s/\s.*//g; - my $loadpercent=100*$loadavg/$loadlim; + my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); my $userloadpercent=&Apache::lonnet::userload(); # ------------------------------------------------------- Do the load balancing my $otherserver='http://'.$ENV{'SERVER_NAME'}; 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? if (($role eq 'access') && (($userloadpercent>100.0)||($loadpercent>100.0))) { @@ -184,15 +179,36 @@ ENDFAILED if ($logtoken eq 'con_lost') { my $spares=''; - foreach (keys %Apache::lonnet::hostname) { - if ($_ ne $lonhost) { - $spares.='
'. - $Apache::lonnet::hostname{$_}.''; - if ($Apache::lonnet::spareid{$_}) { - $spares.=' (preferred)'; - } - } + my $last; + foreach my $hostid (sort + { + $Apache::lonnet::hostname{$a} cmp + $Apache::lonnet::hostname{$b}; + } + keys(%Apache::lonnet::spareid)) { + next if ($hostid eq $lonhost); + next if ($last eq $Apache::lonnet::hostname{$hostid}); + $spares.='
'. + $Apache::lonnet::hostname{$hostid}.''. + ' (preferred)'.$/; + $last=$Apache::lonnet::hostname{$hostid}; + } + $spares.= '
'; + foreach my $hostid (sort + { + $Apache::lonnet::hostname{$a} cmp + $Apache::lonnet::hostname{$b}; + } + keys(%Apache::lonnet::hostname)) { + next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); + next if ($last eq $Apache::lonnet::hostname{$hostid}); + $spares.='
'. + $Apache::lonnet::hostname{$hostid}.''; + $last=$Apache::lonnet::hostname{$hostid}; } $r->print(< @@ -261,9 +277,10 @@ my %lt=&Apache::lonlocal::texthash( 'help' => 'Help', 'serv' => 'Server', 'servadm' => 'Server Administration', - 'sysadm' => 'System Administration'); - - + 'sysadm' => 'System Administration', + 'helpdesk' => 'Contact Helpdesk'); +# -------------------------------------------------- Change password field name + my $now=time; # ---------------------------------------------------------- Serve rest of page $r->print(< - + - + + + @@ -329,8 +355,8 @@ ENDSCRIPT - - + + ENDSERVERFORM if ($fullgraph) { $r->print(<print(<Select Accessibility Options - Suppress rendering of images
- Suppress Java applets
- Suppress rendering of embedded multimedia
- Increase font size
- Switch to black and white mode
+
+
+
+
+

If you have accessibility needs that are not addressed by this interface, please contact the system administrator at $sysadm.


@@ -427,7 +453,7 @@ ENDNOOPT    $lt{'pw'}: - +    $lt{'dom'}: @@ -445,6 +471,8 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript); $r->print(< @@ -497,13 +525,7 @@ ENDLOGIN
- -    $lt{'sysadm'}:
-       $sysadm
-    $lt{'servadm'}:
-       $servadm
 
-    $version - + $contactblock @@ -533,16 +555,59 @@ $domainlogo - +$helpdeskscript ENDDOCUMENT } $r->print(''); 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 .= '   '.$$lt{'sysadm'}.':
'. + '      '.$sysadm.'
'; + } + if ($showservadm) { + $contactblock .= '   '.$$lt{'servadm'}.':
'. + '      '.$servadm.'
 
'; + } + if ($showhelpdesk) { + $contactblock .= '   '.$$lt{'helpdesk'}.'
'; + my $thisurl = &Apache::lonnet::escape('/adm/login'); + $$helpdeskscript = <<"ENDSCRIPT"; + +ENDSCRIPT + } + $contactblock .= <<"ENDBLOCK"; +    $version +ENDBLOCK + return $contactblock; +} + 1; __END__