--- loncom/auth/lonlogin.pm 2009/12/04 13:50:48 1.131 +++ loncom/auth/lonlogin.pm 2010/05/06 16:15:59 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.131 2009/12/04 13:50:48 jms Exp $ +# $Id: lonlogin.pm,v 1.137 2010/05/06 16:15:59 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -72,36 +72,31 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); - if ($handle=~/^publicuser\_/) { + if ($handle ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($handle=~/^publicuser\_/) { # For "public user" - remove it, we apparently really want to login - unlink($r->dir_config('lonIDsDir')."/$handle.id"); - } elsif ($handle ne '') { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { # Indeed, a valid token is found - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); - my $dest = '/adm/roles'; - if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; - } - - my $dom = &Apache::lonnet::default_login_domain(); - my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); - - my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'}; - if ($loginhelp_page eq '') { - $loginhelp_page = '/adm/loginproblems.html'; - } - $r->print( + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + $r->print( $start_page .'

'.&mt('You are already logged in!').'

' .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'

' - .'

'.&mt('Login problems?').'

' - .$dom.' '.$end_page + .$end_page ); - return OK; + return OK; + } } # ---------------------------------------------------- No valid token, continue @@ -121,15 +116,12 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); - my %domconfhash = &Apache::loncommon::get_domainconf($domain); if ($lonhost ne '') { - my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; - if (($loginvia ne '') && ($loginvia ne $lonhost)) { - if (&Apache::lonnet::hostname($loginvia) ne '') { - $r->print(&redirect_page($loginvia)); - return OK; - } - } + my $redirect = &check_loginvia($domain,$lonhost); + if ($redirect) { + $r->print($redirect); + return OK; + } } if (($env{'form.domain'}) && @@ -272,9 +264,12 @@ my $link=&Apache::loncommon::designparm( my $vlink=&Apache::loncommon::designparm('login.vlink',$domain); my $alink=&Apache::loncommon::designparm('login.alink',$domain); my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain); +my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain); +my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain); +my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain); my $logo=&Apache::loncommon::designparm('login.logo',$domain); my $img=&Apache::loncommon::designparm('login.img',$domain); -my $domainlogo=&Apache::loncommon::domainlogo($domain); +my $domainlogo='
'.&Apache::loncommon::domainlogo($domain).'
'; my $login=&Apache::loncommon::designparm('login.login',$domain); if ($login eq '') { $login = $iconpath.'/'.&mt('userauthentication.gif'); @@ -363,7 +358,9 @@ my %lt=&Apache::lonlocal::texthash( # -------------------------------------------------- Change password field name my $forgotpw = &forgotpwdisplay(%lt); -my $loginhelp = &loginhelpdisplay(%lt); +$forgotpw .= '
' if $forgotpw; +my $loginhelp = &loginhelpdisplay($authdomain,%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -373,7 +370,9 @@ $r->print(<$jsh>); # ---------------------------------------------------------- Serve rest of page $r->print( - '
'); + '
' +); # # If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? @@ -395,26 +394,30 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); + $newuserlink = &newuser_link($lt{'newuser'}).'
'; } -my $logintitle; +my $logintitle = + '

'; if ($loginheader eq 'text') { - $logintitle ='

'.$lt{'log'}.'

'; + $logintitle .= $lt{'log'}; } else { - $logintitle = ''.
-                  &mt('User Authentication').''; + $logintitle .= ''.&mt('User Authentication').''; } +$logintitle .= ''; my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< @@ -433,40 +436,29 @@ LFORM if ($showbanner) { $r->print(< - - - - -
- The Learning Online Network with CAPA -
+
+ The Learning Online Network with CAPA +
HEADER } $r->print(< 
-
-
+
+
$logintitle - - - - -
- $loginform -
- $noscript_warning + $loginform + $noscript_warning
-
- $loginhelp
- $forgotpw
-
- $contactblock
-
- $newuserlink
+
+ $loginhelp + $forgotpw + $contactblock + $newuserlink $coursecatalog
+ +
ENDTOP if ($showmainlogo) { $r->print(' '."\n"); @@ -474,14 +466,15 @@ ENDTOP $r->print(< 
+
+
ENDTOP $r->print(< -    $lt{'dom'}:  + $lt{'dom'}:   $domain @@ -489,7 +482,7 @@ $r->print(< -    $lt{'serv'}:  + $lt{'serv'}:   $lonhost ($role) @@ -497,7 +490,7 @@ $r->print(< -    $lt{'load'}:  + $lt{'load'}:   $loadpercent $lt{'perc'} @@ -505,12 +498,17 @@ $r->print(< -    $lt{'userload'}:  + $lt{'userload'}:   $userloadpercent $lt{'perc'} + + + $version + +
@@ -528,22 +526,64 @@ ENDDOCUMENT return OK; } +sub check_loginvia { + my ($domain,$lonhost) = @_; + if ($domain eq '' || $lonhost eq '') { + return; + } + my %domconfhash = &Apache::loncommon::get_domainconf($domain); + my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; + my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost}; + my $output; + if ($loginvia ne '') { + my $noredirect; + my $ip = $ENV{'REMOTE_ADDR'}; + if ($ip eq '127.0.0.1') { + $noredirect = 1; + } else { + if ($loginvia_exempt ne '') { + my @exempt = split(',',$loginvia_exempt); + if (grep(/^\Q$ip\E$/,@exempt)) { + $noredirect = 1; + } + } + } + unless ($noredirect) { + my ($newhost,$path); + if ($loginvia =~ /:/) { + ($newhost,$path) = split(':',$loginvia); + } else { + $newhost = $loginvia; + } + if ($newhost ne $lonhost) { + if (&Apache::lonnet::hostname($newhost) ne '') { + $output = &redirect_page($newhost,$path); + } + } + } + } + return $output; +} + sub redirect_page { - my ($desthost) = @_; + my ($desthost,$path) = @_; my $protocol = $Apache::lonnet::protocol{$desthost}; $protocol = 'http' if ($protocol ne 'https'); - my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/'; + unless ($path =~ m{^/}) { + $path = '/'.$path; + } + my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path; if ($env{'form.firsturl'} ne '') { $url .='?firsturl='.$env{'form.firsturl'}; } - my $start_page = &Apache::loncommon::start_page('Switching Server',undef, + my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef, {'redirect' => [0,$url],}); my $end_page = &Apache::loncommon::end_page(); return $start_page.$end_page; } sub contactdisplay { - my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; my $contactblock; my $showhelpdesk = 0; my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; @@ -573,7 +613,6 @@ function helpdesk() { ENDSCRIPT } - $contactblock .= $version; return $contactblock; } @@ -587,17 +626,20 @@ sub forgotpwdisplay { } sub loginhelpdisplay { - my (%lt) = @_; + my ($authdomain,%lt) = @_; my $login_help = 1; if ($login_help) { - my $dom = &Apache::lonnet::default_login_domain(); - my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); - my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; - if ($loginhelp_url ne '') { - return ''.$lt{'help'}.''; + my $dom = $authdomain; + if ($dom eq '') { + $dom = &Apache::lonnet::default_login_domain(); + } + my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); + my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; + if ($loginhelp_url ne '') { + return ''.$lt{'help'}.''; } else { - return ''.$lt{'help'}.''; - } + return ''.$lt{'help'}.''; + } } return; }