--- loncom/auth/lonlogin.pm 2008/12/10 17:45:29 1.106.2.1
+++ loncom/auth/lonlogin.pm 2010/02/09 17:46:44 1.106.4.4
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.106.2.1 2008/12/10 17:45:29 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106.4.4 2010/02/09 17:46:44 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
);
@@ -179,8 +183,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
@@ -283,7 +297,8 @@ sub handler {
my $now=time;
my $js = (<
+
ENDSCRIPT
@@ -354,7 +370,6 @@ my %lt=&Apache::lonlocal::texthash(
'un' => 'Username',
'pw' => 'Password',
'dom' => 'Domain',
- 'perc' => 'percent',
'load' => 'Server Load',
'userload' => 'User Load',
'about' => 'About LON-CAPA',
@@ -387,7 +402,7 @@ my %lt=&Apache::lonlocal::texthash(
if ($fullgraph) {
$r->print(
- '');
+ '');
}
$r->print(<
HEADER
if ($showbanner) {
- $r->print(<
+ $r->print(<
ENDBANNER
}
$r->print(<'.&mt('Text-based Interface Login').''
.$announcements);
}
- $r->print('