--- loncom/auth/lonlogin.pm 2009/12/04 13:50:48 1.131 +++ loncom/auth/lonlogin.pm 2010/03/03 17:00:01 1.133 @@ -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.133 2010/03/03 17:00:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -121,15 +121,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'}) && @@ -274,7 +271,7 @@ my $alink=&Apache::loncommon::designparm my $mainbg=&Apache::loncommon::designparm('login.mainbg',$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 +360,9 @@ my %lt=&Apache::lonlocal::texthash( # -------------------------------------------------- Change password field name my $forgotpw = &forgotpwdisplay(%lt); +$forgotpw .= '
' if $forgotpw; my $loginhelp = &loginhelpdisplay(%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -395,11 +394,11 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); + $newuserlink = &newuser_link($lt{'newuser'}).'
'; } my $logintitle; if ($loginheader eq 'text') { @@ -414,7 +413,7 @@ my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< @@ -433,13 +432,9 @@ LFORM if ($showbanner) { $r->print(< - - - - -
- The Learning Online Network with CAPA -
+
+ The Learning Online Network with CAPA +
HEADER } $r->print(<
- $loginhelp
- $forgotpw
-
- $contactblock
-
- $newuserlink
+ $loginhelp + $forgotpw + $contactblock + $newuserlink $coursecatalog
@@ -481,7 +474,7 @@ $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,11 +526,53 @@ 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'}; } @@ -543,7 +583,7 @@ sub redirect_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; }