--- loncom/auth/lonlogin.pm 2005/04/28 01:19:20 1.64 +++ loncom/auth/lonlogin.pm 2006/02/28 16:44:19 1.73 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.64 2005/04/28 01:19:20 albertel Exp $ +# $Id: lonlogin.pm,v 1.73 2006/02/28 16:44:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,21 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonauth(); use Apache::lonlocal; +use Apache::migrateuser(); sub handler { my $r = shift; + + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, + ['interface','username','domain','firsturl','localpath','localres', + 'token']); + +# -- check if they are a migrating user + if (defined($env{'form.token'})) { + return &Apache::migrateuser::handler($r); + } + &Apache::loncommon::no_cache($r); &Apache::lonlocal::get_language_handle($r); &Apache::loncommon::content_type($r,'text/html'); @@ -52,6 +64,7 @@ sub handler { return OK; } + # -------------------------------- Prevent users from attempting to login twice my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); my $lonid=$cookies{'lonID'}; @@ -60,10 +73,15 @@ 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") { +# Is there an existing token file? + if ($handle=~/^publicuser\_/) { +# For "public user" - remove it, we apparently really want to login + unlink("$lonidsdir/$handle.id"); + } elsif ($handle ne '') { # Indeed, a valid token is found - my $bodytag=&Apache::loncommon::bodytag('Already logged in'); - $r->print(<print(< Already logged in @@ -77,17 +95,18 @@ $bodytag ENDFAILED - return OK; + return OK; + } } } # ---------------------------------------------------- No valid token, continue - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, - ['interface','username','domain','firsturl','localpath','localres']); - - + # ---------------------------- Not possible to really login to domain "public" + if ($env{'form.domain'} eq 'public') { + $env{'form.domain'}=''; + $env{'form.username'}=''; + } # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; @@ -108,6 +127,10 @@ 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 (&Apache::lonnet::current_machine_domains()) { + if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } + } if (($env{'form.domain'}) && ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { $domain=$env{'form.domain'}; @@ -279,7 +302,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(< - + + + @@ -410,11 +443,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.


@@ -443,7 +476,7 @@ ENDNOOPT    $lt{'pw'}: - +    $lt{'dom'}: