--- loncom/auth/lonlogin.pm 2007/03/08 01:58:48 1.89 +++ loncom/auth/lonlogin.pm 2007/10/01 21:52:50 1.95 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.89 2007/03/08 01:58:48 albertel Exp $ +# $Id: lonlogin.pm,v 1.95 2007/10/01 21:52:50 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,24 +69,17 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice - my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); - my $lonid=$cookies{'lonID'}; - my $cookie; - if ($lonid) { - my $handle=&LONCAPA::clean_handle($lonid->value); - my $lonidsdir=$r->dir_config('lonIDsDir'); - if (-e "$lonidsdir/$handle.id") { -# Is there an existing token file? - if ($handle=~/^publicuser\_/) { + my $handle = &Apache::lonnet::check_for_valid_session($r); + if ($handle=~/^publicuser\_/) { # For "public user" - remove it, we apparently really want to login - unlink("$lonidsdir/$handle.id"); - } elsif ($handle ne '') { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } elsif ($handle ne '') { # Indeed, a valid token is found - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); - $r->print(<print(<You are already logged in

Please either continue the current session or @@ -95,9 +88,7 @@ $start_page Problems?

$end_page ENDFAILED - return OK; - } - } + return OK; } # ---------------------------------------------------- No valid token, continue @@ -120,12 +111,10 @@ ENDFAILED } my $fullgraph=($env{'form.interface'} ne 'textual'); - my $port_to_use=$r->dir_config('lonhttpdPort'); - if (!defined($port_to_use)) { - $port_to_use='8080'; - } - my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. - $r->dir_config('lonIconsURL'); + + my $iconpath= + &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + my $domain = &Apache::lonnet::default_login_domain(); if (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { @@ -133,6 +122,7 @@ ENDFAILED } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); + my $servadm = $r->dir_config('lonAdmEMail'); my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); @@ -245,8 +235,7 @@ ENDTROUBLE } # ----------------------------------------------- Apparently we are in business - - my $domainlogo=&Apache::loncommon::domainlogo($domain); + $servadm=~s/\,/\
/g; # --------------------------------------------------- Print login screen header $r->print(< 'Log in', 'help' => 'Log-in Help', 'serv' => 'Server', + 'servadm' => 'Server Administration', 'helpdesk' => 'Contact Helpdesk', 'forgotpw' => 'Forgot password?'); # -------------------------------------------------- Change password field name @@ -379,6 +374,10 @@ ENDSCRIPT ENDSERVERFORM + my $coursecatalog; + if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}); + } if ($fullgraph) { $r->print(< @@ -415,11 +414,7 @@ ENDSERVERFORM   $lt{'about'} - - -   - $lt{'catalog'} - + $coursecatalog   @@ -478,15 +473,15 @@ ENDNOOPT - + - + - + @@ -508,7 +503,8 @@ ENDNOOPT ENDLOGIN if ($fullgraph) { my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript); + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); $r->print(< @@ -604,13 +600,17 @@ ENDDOCUMENT } sub contactdisplay { - my ($lt,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; my $contactblock; my $showhelpdesk = 0; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { $showhelpdesk = 1; } + if ($servadm && $showadminmail) { + $contactblock .= '   '.$$lt{'servadm'}.':
'. + '      '.$servadm.'
 
'; + } if ($showhelpdesk) { $contactblock .= '   '.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); @@ -652,5 +652,15 @@ sub loginhelpdisplay { return; } +sub coursecatalog_link { + my ($linkname) = @_; + return <<"END"; + + + + +END +} + 1; __END__
User Authentication

   $lt{'un'}:
   :
   $lt{'pw'}:   :
   $lt{'dom'}:   :
 $linkname