--- loncom/auth/lonlogin.pm 2008/01/16 20:42:44 1.98 +++ loncom/auth/lonlogin.pm 2010/03/05 17:37:21 1.106.4.6 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.98 2008/01/16 20:42:44 raeburn Exp $ +# $Id: lonlogin.pm,v 1.106.4.6 2010/03/05 17:37:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,10 @@ 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']); + } # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -78,15 +81,18 @@ sub handler { &Apache::loncommon::start_page('Already logged in'); my $end_page = &Apache::loncommon::end_page(); - $r->print(<You are already logged in -

Please either continue the current session or -logout.

-

-Problems?

-$end_page -ENDFAILED + 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; } @@ -177,8 +183,18 @@ ENDFAILED 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 @@ -199,7 +215,7 @@ ENDFAILED $hostname. '/adm/login?domain='.$authdomain.'">'. $hostname.''. - ' (preferred)'.$/; + ' '.&mt('(preferred)').''.$/; $last=$hostname; } $spares.= '
'; @@ -219,16 +235,20 @@ ENDFAILED $hostname.''; $last=$hostname; } - $r->print(< -The LearningOnline Network with CAPA - - -

This LON-CAPA server is temporarily not available for login

-

Please attempt to login to one of the following servers:

$spares - - -ENDTROUBLE + $r->print( + '' + .'' + .&mt('The LearningOnline Network with CAPA') + .'' + .'' + .'

'.&mt('The LearningOnline Network with CAPA').'

' + .'' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' + .'

'.&mt('Please attempt to login to one of the following servers:').'

' + .$spares + .'' + .'' + ); return OK; } @@ -260,14 +280,25 @@ ENDTROUBLE 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); my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; my $js = (< + ENDSCRIPT @@ -338,18 +370,25 @@ my %lt=&Apache::lonlocal::texthash( 'un' => 'Username', 'pw' => 'Password', 'dom' => 'Domain', - 'perc' => 'percent', - 'load' => 'Load', + 'load' => 'Server Load', 'userload' => 'User Load', 'about' => 'About LON-CAPA', 'access' => 'Accessibility Options', - 'catalog' => 'Course Catalog', + 'catalog' => 'Course/Community Catalog', 'log' => 'Log in', 'help' => 'Log-in Help', 'serv' => 'Server', 'servadm' => 'Server Administration', 'helpdesk' => 'Contact Helpdesk', - 'forgotpw' => 'Forgot password?'); + '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); @@ -363,7 +402,7 @@ my %lt=&Apache::lonlocal::texthash( if ($fullgraph) { $r->print( - ''); + '
'); } $r->print(<print(<print(< - + @@ -439,9 +491,15 @@ ENDSERVERFORM '; @@ -484,13 +545,18 @@ ENDNOOPT $logintitle = ''; } + my $noscript_warning=''; $r->print(< - + + -
The Learning Online Network with CAPA +HEADER + if ($showbanner) { + $r->print(< +ENDBANNER + } + $r->print(<
+ENDSTART + if ($showmainlogo) { + $r->print(< +ENDLOGO + } + $r->print(< @@ -453,22 +511,25 @@ ENDSERVERFORM ENDTOP -} else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); -} - $r->print('
'); + } else { + $r->print('

The LearningOnline Network with CAPA

' + .'

'.&mt('Text-based Interface Login').'

' + .$announcements); + } + $r->print(''); unless ($fullgraph) { $r->print(<Select Accessibility Options -
-
-
-
-
- Remember these settings for next login
+

$lt{'options_headline'}

+
+
+
+
+
+
+ $lt{'remember'}
ENDACCESSOPTIONS -} else { - $r->print(<print(< @@ -476,7 +537,7 @@ ENDACCESSOPTIONS ENDNOOPT -} + } my $logintitle; if ($loginheader eq 'text') { $logintitle = '
   '.$lt{'log'}.''. &mt('User Authentication').'' + .'
+
$logintitle + $noscript_warning @@ -514,6 +580,8 @@ ENDNOOPT

   :
$loginhelp $forgotpw + $newuserlink +
@@ -541,12 +609,12 @@ ENDLOGIN
- +
- @@ -554,24 +622,24 @@ ENDLOGIN - - - - -
   $lt{'dom'}:  +  $domain
   $lt{'serv'}:  +  $lonhost ($role)
-    $lt{'load'}:  + +    $lt{'load'}:  -  $loadpercent $lt{'perc'} + +  $loadpercent%
-    $lt{'userload'}:  + +    $lt{'userload'}:  -  $userloadpercent $lt{'perc'} + +  $userloadpercent%
@@ -607,8 +675,10 @@ $domainlogo $helpdeskscript @@ -636,6 +706,7 @@ sub contactdisplay { my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } @@ -658,7 +730,7 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'

'; + return '
   '.$lt{'forgotpw'}.'
'; } return; } @@ -677,10 +749,15 @@ sub coursecatalog_link { return <<"END";   - $linkname + $linkname END } +sub newuser_link { + my ($linkname) = @_; + return '   '.$linkname.'
'; +} + 1; __END__