--- loncom/auth/lonlogin.pm 2006/02/28 16:42:42 1.72 +++ loncom/auth/lonlogin.pm 2006/05/30 12:45:24 1.75 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.72 2006/02/28 16:42:42 albertel Exp $ +# $Id: lonlogin.pm,v 1.75 2006/05/30 12:45:24 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,9 @@ 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; @@ -80,20 +83,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 +130,7 @@ ENDFAILED 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=$posdomain; } + if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; } } if (($env{'form.domain'}) && ($Apache::lonnet::domaindescription{$env{'form.domain'}})) { @@ -610,7 +611,7 @@ sub contactdisplay { } if ($showhelpdesk) { $contactblock .= '   '.$$lt{'helpdesk'}.'
'; - my $thisurl = &Apache::lonnet::escape('/adm/login'); + my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT";