--- loncom/auth/lonlogin.pm 2011/03/03 06:37:30 1.147 +++ loncom/auth/lonlogin.pm 2012/08/27 00:52:45 1.152 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.147 2011/03/03 06:37:30 raeburn Exp $ +# $Id: lonlogin.pm,v 1.152 2012/08/27 00:52:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,7 +64,8 @@ sub handler { # Are we re-routing? - if (-e '/home/httpd/html/lon-status/reroute.txt') { + my $londocroot = $r->dir_config('lonDocRoot'); + if (-e "$londocroot/lon-status/reroute.txt") { &Apache::lonauth::reroute($r); return OK; } @@ -91,7 +92,7 @@ sub handler { } $r->print( $start_page - .'

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

' + .'

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

' .'

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

' .$end_page @@ -200,9 +201,13 @@ sub handler { 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); -# ------------------- If we cannot talk to ourselves, we are in serious trouble +# -- If we cannot talk to ourselves, or hostID does not map to a hostname +# we are in serious trouble - if ($logtoken eq 'con_lost') { + if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) { + if ($logtoken eq 'no_such_host') { + &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab'); + } my $spares=''; my $last; foreach my $hostid (sort @@ -213,7 +218,7 @@ sub handler { keys(%Apache::lonnet::spareid)) { next if ($hostid eq $lonhost); my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); + next if (($last eq $hostname) || ($hostname eq '')); $spares.='
'. @@ -221,24 +226,26 @@ sub handler { ' '.&mt('(preferred)').''.$/; $last=$hostname; } -$spares.= '
'; -my %all_hostnames = &Apache::lonnet::all_hostnames(); -foreach my $hostid (sort + if ($spares) { + $spares.= '
'; + } + my %all_hostnames = &Apache::lonnet::all_hostnames(); + foreach my $hostid (sort { &Apache::lonnet::hostname($a) cmp &Apache::lonnet::hostname($b); } keys(%all_hostnames)) { - next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); - my $hostname = &Apache::lonnet::hostname($hostid); - next if ($last eq $hostname); - $spares.='
'. - $hostname.''; - $last=$hostname; -} -$r->print( + next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid}); + my $hostname = &Apache::lonnet::hostname($hostid); + next if (($last eq $hostname) || ($hostname eq '')); + $spares.='
'. + $hostname.''; + $last=$hostname; + } + $r->print( '' .'' .&mt('The LearningOnline Network with CAPA') @@ -246,46 +253,49 @@ $r->print( .'<body bgcolor="#FFFFFF">' .'<h1>'.&mt('The LearningOnline Network with CAPA').'</h1>' .'<img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />' - .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>' - .'<p>'.&mt('Please attempt to login to one of the following servers:').'</p>' - .$spares - .'</body>' - .'</html>' -); -return OK; -} + .'<h3>'.&mt('This LON-CAPA server is temporarily not available for login.').'</h3>'); + if ($spares) { + $r->print('<p>'.&mt('Please attempt to login to one of the following servers:') + .'</p>' + .$spares); + } + $r->print('</body>' + .'</html>' + ); + return OK; + } # ----------------------------------------------- Apparently we are in business -$servadm=~s/\,/\<br \/\>/g; + $servadm=~s/\,/\<br \/\>/g; # ----------------------------------------------------------- Front page design -my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); -my $font=&Apache::loncommon::designparm('login.font',$domain); -my $link=&Apache::loncommon::designparm('login.link',$domain); -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 $showbanner = 1; -my $showmainlogo = 1; -if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { - $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain); -} -if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { - $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain); -} -my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); -my $showcoursecat = -&Apache::loncommon::designparm('login.coursecatalog',$domain); -my $shownewuserlink = -&Apache::loncommon::designparm('login.newuser',$domain); -my $now=time; -my $js = (<<ENDSCRIPT); + my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain); + my $font=&Apache::loncommon::designparm('login.font',$domain); + my $link=&Apache::loncommon::designparm('login.link',$domain); + 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 $showbanner = 1; + my $showmainlogo = 1; + if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { + $showbanner = &Apache::loncommon::designparm('login.showlogo_img',$domain); + } + if (defined(&Apache::loncommon::designparm('login.showlogo_logo',$domain))) { + $showmainlogo = &Apache::loncommon::designparm('login.showlogo_logo',$domain); + } + my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); + my $showcoursecat = + &Apache::loncommon::designparm('login.coursecatalog',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); + my $now=time; + my $js = (<<ENDSCRIPT); <script type="text/javascript" language="JavaScript"> // <![CDATA[ @@ -329,7 +339,7 @@ ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = ( + my %add_entries = ( bgcolor => "$mainbg", text => "$font", link => "$link", @@ -337,14 +347,14 @@ my %add_entries = ( alink => "$alink", onload => 'javascript:enableInput();',); -$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, + $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, { 'redirect' => [$expire,'/adm/roles'], 'add_entries' => \%add_entries, 'only_body' => 1,})); # ----------------------------------------------------------------------- Texts -my %lt=&Apache::lonlocal::texthash( + my %lt=&Apache::lonlocal::texthash( 'un' => 'Username', 'pw' => 'Password', 'dom' => 'Domain', @@ -362,29 +372,26 @@ my %lt=&Apache::lonlocal::texthash( ); # -------------------------------------------------- Change password field name -my $forgotpw = &forgotpwdisplay(%lt); -$forgotpw .= '<br />' if $forgotpw; -my $loginhelp = &loginhelpdisplay($authdomain,%lt); -$loginhelp .= '<br />' if $loginhelp; + my $forgotpw = &forgotpwdisplay(%lt); + $forgotpw .= '<br />' if $forgotpw; + my $loginhelp = &Apache::lonauth::loginhelpdisplay($authdomain); + if ($loginhelp) { + $loginhelp = '<a href="'.$loginhelp.'">'.$lt{'help'}.'</a><br />'; + } # ---------------------------------------------------- Serve out DES JavaScript -{ -my $jsh=Apache::File->new($include."/londes.js"); -$r->print(<$jsh>); -} + { + my $jsh=Apache::File->new($include."/londes.js"); + $r->print(<$jsh>); + } # ---------------------------------------------------------- Serve rest of page -$r->print( + $r->print( '<div class="LC_Box"' .' style="margin:0 auto; padding:10px; width:90%; height: auto; background-color:#FFFFFF;">' ); -# -# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? -# then just us a relative link to authenticate: -# - -$r->print(<<ENDSERVERFORM); + $r->print(<<ENDSERVERFORM); <form name="server" action="/adm/authenticate" method="post" target="_top"> <input type="hidden" name="logtoken" value="$logtoken" /> <input type="hidden" name="serverid" value="$lonhost" /> @@ -397,29 +404,29 @@ $r->print(<<ENDSERVERFORM); <input type="hidden" name="localres" value="$env{'form.localres'}" /> </form> ENDSERVERFORM -my $coursecatalog; -if (($showcoursecat eq '') || ($showcoursecat)) { - $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />'; -} -my $newuserlink; -if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}).'<br />'; -} -my $logintitle = - '<h2 class="LC_hcell"' - .' style="background:'.$loginbox_header_bgcol.';' - .' color:'.$loginbox_header_textcol.'">' - .$lt{'log'} - .'</h2>'; - -my $noscript_warning='<noscript><span class="LC_warning"><b>' - .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.') - .'</b></span></noscript>'; -my $helpdeskscript; -my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $authdomain,\$helpdeskscript); + my $coursecatalog; + if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}).'<br />'; + } + my $newuserlink; + if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}).'<br />'; + } + my $logintitle = + '<h2 class="LC_hcell"' + .' style="background:'.$loginbox_header_bgcol.';' + .' color:'.$loginbox_header_textcol.'">' + .$lt{'log'} + .'</h2>'; + + my $noscript_warning='<noscript><span class="LC_warning"><b>' + .&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.') + .'</b></span></noscript>'; + my $helpdeskscript; + my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $authdomain,\$helpdeskscript); -my $loginform=(<<LFORM); + my $loginform=(<<LFORM); <form name="client" action="" onsubmit="return(send())"> <input type="hidden" name="lextkey" value="$lextkey" /> <input type="hidden" name="uextkey" value="$uextkey" /> @@ -523,7 +530,7 @@ END END } -$r->print(<<ENDDOCUMENT); + $r->print(<<ENDDOCUMENT); <div style="float: left;"> <table border="0" cellspacing="0" cellpadding="0"> $domainrow @@ -651,25 +658,6 @@ sub forgotpwdisplay { } return; } - -sub loginhelpdisplay { - my ($authdomain,%lt) = @_; - my $login_help = 1; - if ($login_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 '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>'; - } else { - return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; - } - } - return; -} sub coursecatalog_link { my ($linkname) = @_;