--- loncom/auth/lonlogin.pm 2009/03/16 18:20:17 1.116
+++ loncom/auth/lonlogin.pm 2009/09/11 23:04:45 1.125
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.116 2009/03/16 18:20:17 bisitz Exp $
+# $Id: lonlogin.pm,v 1.125 2009/09/11 23:04:45 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
);
@@ -103,8 +107,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 +174,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 +247,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);
@@ -271,6 +278,7 @@ 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 +332,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 +352,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(<
@@ -389,7 +397,7 @@ my $contactblock = &contactdisplay(\%lt,
$version,$authdomain,\$helpdeskscript);
my $loginform=(<
+
+
+
$logintitle
@@ -438,18 +442,19 @@ HEADER
$forgotpw
$contactblock
$newuserlink
- $coursecatalog
- $lt{'about'}
+ $coursecatalog
-
-
+
+ENDTOP
+ if ($showmainlogo) {
+ $r->print(' '."\n");
+ }
+$r->print(<
ENDTOP
-}
-if($announcements){$r->print('
');}
-
-if ($fullgraph) {
$r->print(<
@@ -488,13 +493,14 @@ $r->print(<
$helpdeskscript
ENDDOCUMENT
-}
my %endargs = ( 'noredirectlink' => 1, );
$r->print(&Apache::loncommon::end_page(\%endargs));
return OK;
@@ -517,6 +523,7 @@ sub contactdisplay {
my $thisurl = &escape('/adm/login');
$$helpdeskscript = <<"ENDSCRIPT";
ENDSCRIPT
}