--- loncom/auth/lonlogin.pm 2005/12/28 16:46:47 1.71 +++ loncom/auth/lonlogin.pm 2006/09/19 19:03:08 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.71 2005/12/28 16:46:47 albertel Exp $ +# $Id: lonlogin.pm,v 1.80 2006/09/19 19:03:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,12 +37,16 @@ use Apache::loncommon(); use Apache::lonauth(); use Apache::lonlocal; use Apache::migrateuser(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + sub handler { my $r = shift; &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'}.'&'.$env{'request.querystring'}, + (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, + $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', 'token']); @@ -80,20 +84,18 @@ sub handler { unlink("$lonidsdir/$handle.id"); } elsif ($handle ne '') { # Indeed, a valid token is found - my $bodytag=&Apache::loncommon::bodytag('Already logged in'); + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); $r->print(< - -Already logged in - -$bodytag +$start_page

You are already logged in

Please either continue the current session or logout.

Problems?

- - +$end_page ENDFAILED return OK; } @@ -129,7 +131,7 @@ ENDFAILED 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 (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } } if (($env{'form.domain'}) && ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { @@ -144,6 +146,7 @@ ENDFAILED my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); my $version = $r->dir_config('lonVersion'); + my $host_name = $Apache::lonnet::hostname{$lonhost}; # --------------------------------------------- Default values for login fields @@ -161,7 +164,7 @@ ENDFAILED my $userloadpercent=&Apache::lonnet::userload(); # ------------------------------------------------------- Do the load balancing - my $otherserver='http://'.$ENV{'SERVER_NAME'}; + 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? @@ -610,7 +613,7 @@ sub contactdisplay { } if ($showhelpdesk) { $contactblock .= '   '.$$lt{'helpdesk'}.'
'; - my $thisurl = &Apache::lonnet::escape('/adm/login'); + my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";