--- loncom/auth/lonlogin.pm 2008/11/22 19:07:02 1.107 +++ loncom/auth/lonlogin.pm 2009/10/21 12:29:40 1.128 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.107 2008/11/22 19:07:02 tempelho Exp $ +# $Id: lonlogin.pm,v 1.128 2009/10/21 12:29:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,7 @@ sub handler { (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'}, $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', - 'token']); + 'token','role','symb']); if (!defined($env{'form.firsturl'})) { &Apache::lonacc::get_posted_cgi($r,['firsturl']); } @@ -81,11 +81,15 @@ sub handler { &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]logout[_4].', - '','','','').'

' + .'

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

' .'

'.&mt('Login problems?').'

' .$end_page ); @@ -102,21 +106,24 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - # my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - # foreach (split(/\:/,$textbrowsers)) { -# if ($httpbrowser=~/$_/i) { -# $env{'form.interface'}='textual'; -# } -# } - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); + 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; + } + } + } + if (($env{'form.domain'}) && (&Apache::lonnet::domain($env{'form.domain'},'description'))) { $domain=$env{'form.domain'}; @@ -124,7 +131,6 @@ sub handler { my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); - my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); @@ -179,8 +185,18 @@ sub handler { if ($uextkey>2147483647) { $uextkey-=4294967296; } # -------------------------------------------------------- Store away log token + my $tokenextras; + if ($env{'form.role'}) { + $tokenextras = '&role='.&escape($env{'form.role'}); + } + if ($env{'form.symb'}) { + if (!$tokenextras) { + $tokenextras = '&'; + } + $tokenextras .= '&symb='.&escape($env{'form.symb'}); + } my $logtoken=Apache::lonnet::reply( - 'tmpput:'.$ukey.$lkey.'&'.$firsturl, + 'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras, $lonhost); # ------------------- If we cannot talk to ourselves, we are in serious trouble @@ -242,23 +258,12 @@ return OK; $servadm=~s/\,/\
/g; # ----------------------------------------------------------- Front page design -my $pgbg= -($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); -my $font= -($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); -my $link= -($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); -my $vlink= -($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); +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= -($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); -my $sidebg= -($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); -my $textcol = -($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000'); -my $bgcol = -($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF'); +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); @@ -266,6 +271,14 @@ my $login=&Apache::loncommon::designparm if ($login eq '') { $login = $iconpath.'/'.&mt('userauthentication.gif'); } +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); @@ -275,7 +288,8 @@ my $shownewuserlink = my $now=time; my $js = (< + ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = (topmargin => "0", - leftmargin => "0", - marginheight => "0", - marginwidth => "0", - bgcolor => "$pgbg", +my %add_entries = ( + bgcolor => "$mainbg", text => "$font", link => "$link", vlink => "$vlink", @@ -331,7 +343,6 @@ my %lt=&Apache::lonlocal::texthash( 'perc' => 'percent', 'load' => 'Server Load', 'userload' => 'User Load', - 'about' => 'About LON-CAPA', 'catalog' => 'Course Catalog', 'log' => 'Log in', 'help' => 'Log-in Help', @@ -340,13 +351,7 @@ my %lt=&Apache::lonlocal::texthash( 'helpdesk' => 'Contact Helpdesk', 'forgotpw' => 'Forgot password?', 'newuser' => 'New User?', - 'options_headline' => 'Select Accessibility Options', - 'sprs_img' => 'Suppress rendering of images', - 'sprs_applet' => 'Suppress Java applets', - 'sprs_embed' => 'Suppress rendering of embedded multimedia', - 'sprs_font' => 'Increase font size', - 'sprs_blackwhite' => 'Switch to black and white mode', - 'remember' => 'Remember these settings for next login'); + ); # -------------------------------------------------- Change password field name my $forgotpw = &forgotpwdisplay(%lt); my $loginhelp = &loginhelpdisplay(%lt); @@ -358,10 +363,13 @@ $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page -if ($fullgraph) { $r->print( '
'); -} + +# +# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing? +# then just us a relative link to authenticate: +# $r->print(< @@ -376,139 +384,153 @@ $r->print(< ENDSERVERFORM - my $coursecatalog; - if (($showcoursecat eq '') || ($showcoursecat)) { - $coursecatalog = &coursecatalog_link($lt{'catalog'}); - } - my $newuserlink; - if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); - } - my $logintitle; - if ($loginheader eq 'text') { - $logintitle = $lt{'log'}; - } else { - $logintitle = ''.
-                      &mt('User Authentication').''; - } - - my $noscript_warning=''; - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); - - if ($fullgraph) { - $r->print(< +my $coursecatalog; +if (($showcoursecat eq '') || ($showcoursecat)) { + $coursecatalog = &coursecatalog_link($lt{'catalog'}); +} +my $newuserlink; +if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}).'
'; +} +my $logintitle; +if ($loginheader eq 'text') { + $logintitle ='

'.$lt{'log'}.'

'; +} else { + $logintitle = ''.
+                  &mt('User Authentication').''; +} + +my $noscript_warning=''; +my $helpdeskscript; +my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, + $version,$authdomain,\$helpdeskscript); + +my $loginform=(< + + + :
+
+ :
+
+ :
+
+ + +LFORM + + if ($showbanner) { + $r->print(< - - - + + +
The Learning Online Network with CAPA
+ The Learning Online Network with CAPA +
- -
 
- -
-$logintitle - - - - - -
$domainlogo -ENDTOP - -$r->print('
'); - -$r->print(< - - :
-
- :
-
- :
-
- - -
-$noscript_warning -
+HEADER + } + $r->print(< 
+
+
+ $logintitle + + + + +
+ $loginform +
+ $noscript_warning +
$loginhelp
- $forgotpw

- $newuserlink
- $coursecatalog

- $lt{'about'}
- $helpdeskscript + $forgotpw
+ $contactblock
+ $newuserlink + $coursecatalog
-
 
+
+ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(<print('
 
');} - - - if ($fullgraph) { - - $r->print(<  +ENDTOP - +$r->print(< - - - - - - - -
+    $lt{'dom'}:  +  $domain
+    $lt{'serv'}:  +  $lonhost ($role)
+    $lt{'load'}:  +  $loadpercent $lt{'perc'}
+    $lt{'userload'}:  +  $userloadpercent $lt{'perc'}
- - $contactblock - $helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; } +sub redirect_page { + my ($desthost) = @_; + my $protocol = $Apache::lonnet::protocol{$desthost}; + $protocol = 'http' if ($protocol ne 'https'); + my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/'; + if ($env{'form.firsturl'} ne '') { + $url .='?firsturl='.$env{'form.firsturl'}; + } + my $start_page = &Apache::loncommon::start_page('Switching Server',undef, + {'redirect' => [0,$url],}); + my $end_page = &Apache::loncommon::end_page(); + return $start_page.$end_page; +} + sub contactdisplay { my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; my $contactblock; @@ -522,10 +544,11 @@ sub contactdisplay { '      '.$servadm.'
 
'; } if ($showhelpdesk) { - $contactblock .= '   '.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT }