--- loncom/auth/lonlogin.pm 2009/10/06 21:58:30 1.126 +++ 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.126 2009/10/06 21:58:30 raeburn Exp $ +# $Id: lonlogin.pm,v 1.133 2010/03/03 17:00:01 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('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'
' - .'' - .$end_page + .'' + .$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='- - | -