--- loncom/auth/lonlogin.pm 2009/10/06 21:58:30 1.126 +++ loncom/auth/lonlogin.pm 2010/03/03 17:05:49 1.134 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.126 2009/10/06 21:58:30 raeburn Exp $ +# $Id: lonlogin.pm,v 1.134 2010/03/03 17:05:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,13 +85,21 @@ sub handler { 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( $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?').'

' - .$end_page + .'

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

' + .$dom.' '.$end_page ); return OK; } @@ -113,20 +121,12 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $domain = &Apache::lonnet::default_login_domain(); - my %domconfig = &Apache::loncommon::get_domainconf($domain); if ($lonhost ne '') { - if (ref($domconfig{login}) eq 'HASH') { - if (ref($domconfig{login}{loginvia}) eq 'HASH') { - if ($domconfig{login}{loginvia}{$lonhost}) { - my $loginvia = $domconfig{login}{loginvia}{$lonhost}; - my %servers = &Apache::lonnet::get_servers($domain); - if (($servers{$loginvia} ne '') && ($loginvia ne $lonhost)) { - $r->print(&redirect_page($loginvia)); - return OK; - } - } - } - } + my $redirect = &check_loginvia($domain,$lonhost); + if ($redirect) { + $r->print($redirect); + return OK; + } } if (($env{'form.domain'}) && @@ -271,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'); @@ -342,24 +342,27 @@ $r->print(&Apache::loncommon::start_page # ----------------------------------------------------------------------- Texts my %lt=&Apache::lonlocal::texthash( - 'un' => 'Username', - 'pw' => 'Password', - 'dom' => 'Domain', - 'perc' => 'percent', - 'load' => 'Server Load', - 'userload' => 'User Load', - 'catalog' => 'Course Catalog', - 'log' => 'Log in', - 'help' => 'Log-in Help', - 'serv' => 'Server', - 'servadm' => 'Server Administration', - 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?', - 'newuser' => 'New User?', - ); + 'un' => 'Username', + 'pw' => 'Password', + 'dom' => 'Domain', + 'perc' => 'percent', + 'load' => 'Server Load', + 'userload' => 'User Load', + 'catalog' => 'Course/Community Catalog', + 'log' => 'Log in', + 'help' => 'Log-in Help', + 'serv' => 'Server', + 'servadm' => 'Server Administration', + 'helpdesk' => 'Contact Helpdesk', + 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', + ); # -------------------------------------------------- Change password field name + my $forgotpw = &forgotpwdisplay(%lt); +$forgotpw .= '
' if $forgotpw; my $loginhelp = &loginhelpdisplay(%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -391,7 +394,7 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { @@ -410,18 +413,18 @@ my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< :
-
+
:
-
+
:
-
+
LFORM @@ -429,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 - $coursecatalog + $loginhelp + $forgotpw + $contactblock + $newuserlink + $coursecatalog
ENDTOP @@ -475,7 +474,7 @@ $r->print(< -    $lt{'dom'}:  + $lt{'dom'}:   $domain @@ -483,7 +482,7 @@ $r->print(< -    $lt{'serv'}:  + $lt{'serv'}:   $lonhost ($role) @@ -491,7 +490,7 @@ $r->print(< -    $lt{'load'}:  + $lt{'load'}:   $loadpercent $lt{'perc'} @@ -499,12 +498,17 @@ $r->print(< -    $lt{'userload'}:  + $lt{'userload'}:   $userloadpercent $lt{'perc'} + + + $version + + @@ -522,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'}; } @@ -537,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'}; @@ -545,8 +591,8 @@ sub contactdisplay { $showhelpdesk = 1; } if ($servadm && $showadminmail) { - $contactblock .= '   '.$$lt{'servadm'}.':
'. - '      '.$servadm.'
 
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { $contactblock .= ''.$lt->{'helpdesk'}.'
'; @@ -567,9 +613,6 @@ function helpdesk() { ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK return $contactblock; } @@ -586,7 +629,14 @@ sub loginhelpdisplay { my (%lt) = @_; my $login_help = 1; if ($login_help) { - return ''.$lt{'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'}.''; + } else { + return ''.$lt{'help'}.''; + } } return; } @@ -594,13 +644,13 @@ sub loginhelpdisplay { sub coursecatalog_link { my ($linkname) = @_; return <<"END"; - $linkname + $linkname END } sub newuser_link { my ($linkname) = @_; - return '   '.$linkname.'
'; + return ''.$linkname.''; } 1;