--- 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='
- - | -