--- loncom/auth/lonlogin.pm 2009/10/21 12:29:40 1.128 +++ loncom/auth/lonlogin.pm 2010/08/25 22:03:51 1.142 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.128 2009/10/21 12:29:40 raeburn Exp $ +# $Id: lonlogin.pm,v 1.142 2010/08/25 22:03:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,31 +69,35 @@ sub handler { return OK; } + $env{'form.firsturl'} =~ =~ s/(`)/'/g; # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); - if ($handle=~/^publicuser\_/) { + if ($handle ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($handle=~/^publicuser\_/) { # For "public user" - remove it, we apparently really want to login - unlink($r->dir_config('lonIDsDir')."/$handle.id"); - } elsif ($handle ne '') { + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { # Indeed, a valid token is found - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); - my $dest = '/adm/roles'; - if ($env{'form.firsturl'} ne '') { - $dest = $env{'form.firsturl'}; - } - $r->print( + &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + $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 ); - return OK; + return OK; + } } # ---------------------------------------------------- No valid token, continue @@ -113,15 +117,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'}) && @@ -152,15 +153,8 @@ sub handler { my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim); my $userloadpercent=&Apache::lonnet::userload(); -# ------------------------------------------------------- Do the load balancing - my $otherserver= &Apache::lonnet::absolute_url($host_name); my $firsturl= ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'}); -# ---------------------------------------------------------- Are we overloaded? - if ((($userloadpercent>100.0)||($loadpercent>100.0))) { - my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent); - if ($unloaded) { $otherserver=$unloaded; } - } # ----------------------------------------------------------- Get announcements my $announcements=&Apache::lonnet::getannounce(); @@ -264,13 +258,12 @@ my $link=&Apache::loncommon::designparm( 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 $login=&Apache::loncommon::designparm('login.login',$domain); -if ($login eq '') { -$login = $iconpath.'/'.&mt('userauthentication.gif'); -} my $showbanner = 1; my $showmainlogo = 1; if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) { @@ -282,7 +275,6 @@ if (defined(&Apache::loncommon::designpa my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain); my $showcoursecat = &Apache::loncommon::designparm('login.coursecatalog',$domain); -my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); my $shownewuserlink = &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; @@ -315,6 +307,14 @@ this.document.client.elements.upass$now. this.document.server.submit(); return false; } + +function enableInput() { + this.document.client.elements.upass$now.removeAttribute("readonly"); + this.document.client.elements.uname.removeAttribute("readonly"); + this.document.client.elements.udom.removeAttribute("readonly"); + return; +} + // ]]> @@ -327,7 +327,8 @@ my %add_entries = ( text => "$font", link => "$link", vlink => "$vlink", - alink => "$alink",); + alink => "$alink", + onload => 'javascript:enableInput();',); $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js, { 'redirect' => [$expire,'/adm/roles'], @@ -337,24 +338,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); -my $loginhelp = &loginhelpdisplay(%lt); +$forgotpw .= '
' if $forgotpw; +my $loginhelp = &loginhelpdisplay($authdomain,%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -364,7 +368,9 @@ $r->print(<$jsh>); # ---------------------------------------------------------- Serve rest of page $r->print( - '
'); + '
' +); # # If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? @@ -372,7 +378,7 @@ $r->print( # $r->print(< +
@@ -386,37 +392,36 @@ $r->print(<'; } my $newuserlink; if ($shownewuserlink) { $newuserlink = &newuser_link($lt{'newuser'}).'
'; } -my $logintitle; -if ($loginheader eq 'text') { - $logintitle ='

'.$lt{'log'}.'

'; -} else { - $logintitle = ''. - &mt('User Authentication').''; -} +my $logintitle = + '

' + .$lt{'log'} + .'

'; my $noscript_warning=''; my $helpdeskscript; my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); + $authdomain,\$helpdeskscript); my $loginform=(< :
-
+
:
-
+
:
-
+
LFORM @@ -424,53 +429,45 @@ LFORM if ($showbanner) { $r->print(< - - - - -
- The Learning Online Network with CAPA -
+
+ The Learning Online Network with CAPA +
HEADER } $r->print(< 
-
-
+
+
$logintitle - - - - -
- $loginform -
- $noscript_warning + $loginform + $noscript_warning
-
- $loginhelp
- $forgotpw
- $contactblock
- $newuserlink - $coursecatalog +
+ $loginhelp + $forgotpw + $contactblock + $newuserlink + $coursecatalog
+ +
ENDTOP if ($showmainlogo) { $r->print(' '."\n"); } $r->print(< 
+
+
ENDTOP $r->print(< + + +
-    $lt{'dom'}:  + $lt{'dom'}:   $domain @@ -478,7 +475,7 @@ $r->print(<
-    $lt{'serv'}:  + $lt{'serv'}:   $lonhost ($role) @@ -486,7 +483,7 @@ $r->print(<
-    $lt{'load'}:  + $lt{'load'}:   $loadpercent $lt{'perc'} @@ -494,13 +491,23 @@ $r->print(<
-    $lt{'userload'}:  + $lt{'userload'}:   $userloadpercent $lt{'perc'}
+ $version +
+
+
+ $domainlogo +
+
ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; -    $version -ENDBLOCK return $contactblock; } @@ -578,10 +624,20 @@ sub forgotpwdisplay { } sub loginhelpdisplay { - my (%lt) = @_; + my ($authdomain,%lt) = @_; my $login_help = 1; if ($login_help) { - return ''.$lt{'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 ''.$lt{'help'}.''; + } else { + return ''.$lt{'help'}.''; + } } return; } @@ -595,7 +651,7 @@ END sub newuser_link { my ($linkname) = @_; - return '   '.$linkname.'
'; + return ''.$linkname.''; } 1;