--- loncom/auth/lonlogin.pm 2008/12/10 15:45:38 1.112 +++ loncom/auth/lonlogin.pm 2009/07/22 21:51:03 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.112 2008/12/10 15:45:38 muellerd Exp $ +# $Id: lonlogin.pm,v 1.124 2009/07/22 21:51:03 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']); } @@ -84,7 +84,7 @@ sub handler { $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 @@ -103,8 +103,6 @@ sub handler { $env{'form.interface'}=~s/\W//g; my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); @@ -172,8 +170,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 @@ -235,17 +243,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 $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); @@ -270,7 +273,8 @@ my $shownewuserlink = my $now=time; my $js = (< + ENDSCRIPT # --------------------------------------------------- Print login screen header -my %add_entries = (topmargin => "0", - leftmargin => "0", - marginheight => "0", - marginwidth => "0", +my %add_entries = ( bgcolor => "$mainbg", text => "$font", link => "$link", @@ -326,7 +328,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', @@ -347,10 +348,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(< @@ -371,11 +375,11 @@ if (($showcoursecat eq '') || ($showcour } my $newuserlink; if ($shownewuserlink) { - $newuserlink = &newuser_link($lt{'newuser'}); + $newuserlink = &newuser_link($lt{'newuser'}).'
'; } my $logintitle; if ($loginheader eq 'text') { - $logintitle ='

'.$lt{'log'}.'

'; + $logintitle ='

'.$lt{'log'}.'

'; } else { $logintitle = ''. &mt('User Authentication').''; @@ -389,38 +393,34 @@ my $contactblock = &contactdisplay(\%lt, $version,$authdomain,\$helpdeskscript); my $loginform=(< - - +
+ + :
-
+
:
-
+
:
-
+
LFORM -if ($fullgraph) { if ($showbanner) { $r->print(<
- The Learning Online Network with CAPA + The Learning Online Network with CAPA
HEADER } - if ($showmainlogo) { - $r->print('
 
'."\n". - ' '."\n"); - } $r->print(<$domainlogo
+
 
+
$logintitle @@ -435,23 +435,24 @@ HEADER
$loginhelp
- $forgotpw

- $newuserlink
- $coursecatalog

- $lt{'about'}
- $contactblock + $forgotpw
+ $contactblock
+ $newuserlink + $coursecatalog
- -
 
+ +ENDTOP + if ($showmainlogo) { + $r->print(' '."\n"); + } +$r->print(<  ENDTOP -} -if($announcements){$r->print('
 
');} - -if ($fullgraph) { $r->print(< +
   $lt{'dom'}:  @@ -488,13 +489,14 @@ $r->print(< $helpdeskscript ENDDOCUMENT -} my %endargs = ( 'noredirectlink' => 1, ); $r->print(&Apache::loncommon::end_page(\%endargs)); return OK; @@ -513,10 +515,11 @@ sub contactdisplay { '      '.$servadm.'
 
'; } if ($showhelpdesk) { - $contactblock .= ''.$lt->{'helpdesk'}.'
'; + $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT }