--- loncom/auth/lonlogin.pm 2011/06/11 18:21:07 1.148 +++ loncom/auth/lonlogin.pm 2013/01/28 02:00:58 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.148 2011/06/11 18:21:07 raeburn Exp $ +# $Id: lonlogin.pm,v 1.155 2013/01/28 02:00:58 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 @@ -228,23 +229,23 @@ sub handler { if ($spares) { $spares.= '
'; } -my %all_hostnames = &Apache::lonnet::all_hostnames(); -foreach my $hostid (sort + 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) || ($hostname eq '')); - $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') @@ -253,48 +254,54 @@ $r->print( .'<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>'); - if ($spares) { - $r->print('<p>'.&mt('Please attempt to login to one of the following servers:') - .'</p>' - .$spares); - } - $r->print('</body>' - .'</html>' - ); -return OK; -} + 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; + my @possdoms = &Apache::lonnet::current_machine_domains(); + if (grep(/^\Q$domain\E$/,@possdoms)) { + $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); + } + my $showcoursecat = + &Apache::loncommon::designparm('login.coursecatalog',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); + my $showhelpdesk = + &Apache::loncommon::designparm('login.helpdesk',$domain); + my $now=time; + my $js = (<<ENDSCRIPT); <script type="text/javascript" language="JavaScript"> // <![CDATA[ @@ -338,7 +345,7 @@ ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = ( + my %add_entries = ( bgcolor => "$mainbg", text => "$font", link => "$link", @@ -346,14 +353,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', @@ -371,29 +378,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" /> @@ -406,29 +410,30 @@ $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, + $showhelpdesk,\@possdoms); -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" /> @@ -532,7 +537,7 @@ END END } -$r->print(<<ENDDOCUMENT); + $r->print(<<ENDDOCUMENT); <div style="float: left;"> <table border="0" cellspacing="0" cellpadding="0"> $domainrow @@ -619,12 +624,24 @@ sub redirect_page { } sub contactdisplay { - my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_; + my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript,$showhelpdesk, + $possdoms) = @_; my $contactblock; - my $showhelpdesk = 0; - my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; - if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) { - $showhelpdesk = 1; + my $origmail; + if (ref($possdoms) eq 'ARRAY') { + if (grep(/^\Q$authdomain\E$/,@{$possdoms})) { + $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; + } + } + my $requestmail = + &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $authdomain,$origmail); + unless ($showhelpdesk eq '0') { + if ($requestmail =~ m/[^\@]+\@[^\@]+/) { + $showhelpdesk = 1; + } else { + $showhelpdesk = 0; + } } if ($servadm && $showadminmail) { $contactblock .= $$lt{'servadm'}.':<br />'. @@ -637,7 +654,8 @@ sub contactdisplay { <script type="text/javascript"> // <![CDATA[ function helpdesk() { - var codedom = document.client.udom.value; + var possdom = document.client.udom.value; + var codedom = possdom.replace( new RegExp("[^A-Za-z0-9.\\-]","g"),''); if (codedom == '') { codedom = "$authdomain"; } @@ -660,25 +678,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) = @_;