--- loncom/auth/lonlogin.pm 2005/04/07 06:56:21 1.63 +++ loncom/auth/lonlogin.pm 2005/11/23 20:46:04 1.69 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.63 2005/04/07 06:56:21 albertel Exp $ +# $Id: lonlogin.pm,v 1.69 2005/11/23 20:46:04 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,7 @@ sub handler { my $handle=$lonid->value; $handle=~s/\W//g; my $lonidsdir=$r->dir_config('lonIDsDir'); - if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) { + if ((-e "$lonidsdir/$handle.id") && ($handle ne '') && ($handle!~/^publicuser\_/)) { # Indeed, a valid token is found my $bodytag=&Apache::loncommon::bodytag('Already logged in'); $r->print(<dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); + my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0]; + foreach my $posdom (&Apache::lonnet::current_machine_domains()) { + if ($posdom eq $testdomain) { $domain=$testdomain; } + } if (($env{'form.domain'}) && ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { $domain=$env{'form.domain'}; @@ -179,22 +183,36 @@ ENDFAILED if ($logtoken eq 'con_lost') { my $spares=''; - - foreach my $hostid (keys(%Apache::lonnet::spareid)) { + 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 (keys(%Apache::lonnet::hostname)) { + 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(< @@ -265,7 +283,8 @@ my %lt=&Apache::lonlocal::texthash( 'servadm' => 'Server Administration', 'sysadm' => 'System Administration', 'helpdesk' => 'Contact Helpdesk'); - +# -------------------------------------------------- Change password field name + my $now=time; # ---------------------------------------------------------- Serve rest of page $r->print(< - + + + @@ -396,11 +424,11 @@ ENDTOP unless ($fullgraph) { $r->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.


@@ -429,7 +457,7 @@ ENDNOOPT    $lt{'pw'}: - +    $lt{'dom'}: