--- loncom/auth/lonlogin.pm 2009/05/22 17:01:28 1.122
+++ loncom/auth/lonlogin.pm 2010/08/26 08:10:47 1.143
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.122 2009/05/22 17:01:28 bisitz Exp $
+# $Id: lonlogin.pm,v 1.143 2010/08/26 08:10:47 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']);
}
@@ -69,27 +69,35 @@ sub handler {
return OK;
}
+ $env{'form.firsturl'} =~ s/(`)/'/g;
# -------------------------------- Prevent users from attempting to login twice
my $handle = &Apache::lonnet::check_for_valid_session($r);
- if ($handle=~/^publicuser\_/) {
+ if ($handle ne '') {
+ my $lonidsdir=$r->dir_config('lonIDsDir');
+ if ($handle=~/^publicuser\_/) {
# For "public user" - remove it, we apparently really want to login
- unlink($r->dir_config('lonIDsDir')."/$handle.id");
- } elsif ($handle ne '') {
+ unlink($r->dir_config('lonIDsDir')."/$handle.id");
+ } else {
# Indeed, a valid token is found
- my $start_page =
- &Apache::loncommon::start_page('Already logged in');
- my $end_page =
- &Apache::loncommon::end_page();
- $r->print(
+ &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+ my $start_page =
+ &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]log out[_4].',
- '','','','').'
'
- .''.&mt('Login problems?').'
'
+ '','','','').''
.$end_page
);
- return OK;
+ return OK;
+ }
}
# ---------------------------------------------------- No valid token, continue
@@ -107,7 +115,16 @@ sub handler {
my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ my $lonhost = $r->dir_config('lonHostID');
my $domain = &Apache::lonnet::default_login_domain();
+ if ($lonhost ne '') {
+ my $redirect = &check_loginvia($domain,$lonhost);
+ if ($redirect) {
+ $r->print($redirect);
+ return OK;
+ }
+ }
+
if (($env{'form.domain'}) &&
(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$env{'form.domain'};
@@ -115,7 +132,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');
@@ -137,15 +153,8 @@ sub handler {
my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
my $userloadpercent=&Apache::lonnet::userload();
-# ------------------------------------------------------- Do the load balancing
- my $otherserver= &Apache::lonnet::absolute_url($host_name);
my $firsturl=
($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
-# ---------------------------------------------------------- Are we overloaded?
- if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
- my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
- if ($unloaded) { $otherserver=$unloaded; }
- }
# ----------------------------------------------------------- Get announcements
my $announcements=&Apache::lonnet::getannounce();
@@ -170,8 +179,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
@@ -239,13 +258,12 @@ my $link=&Apache::loncommon::designparm(
my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
my $alink=&Apache::loncommon::designparm('login.alink',$domain);
my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
+my $loginbox_bg=&Apache::loncommon::designparm('login.sidebg',$domain);
+my $loginbox_header_bgcol=&Apache::loncommon::designparm('login.bgcol',$domain);
+my $loginbox_header_textcol=&Apache::loncommon::designparm('login.textcol',$domain);
my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);
my $domainlogo=&Apache::loncommon::domainlogo($domain);
-my $login=&Apache::loncommon::designparm('login.login',$domain);
-if ($login eq '') {
-$login = $iconpath.'/'.&mt('userauthentication.gif');
-}
my $showbanner = 1;
my $showmainlogo = 1;
if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
@@ -257,7 +275,6 @@ if (defined(&Apache::loncommon::designpa
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;
@@ -290,6 +307,14 @@ this.document.client.elements.upass$now.
this.document.server.submit();
return false;
}
+
+function enableInput() {
+ this.document.client.elements.upass$now.removeAttribute("readonly");
+ this.document.client.elements.uname.removeAttribute("readonly");
+ this.document.client.elements.udom.removeAttribute("readonly");
+ return;
+}
+
// ]]>
@@ -302,7 +327,8 @@ my %add_entries = (
text => "$font",
link => "$link",
vlink => "$vlink",
- alink => "$alink",);
+ alink => "$alink",
+ onload => 'javascript:enableInput();',);
$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
{ 'redirect' => [$expire,'/adm/roles'],
@@ -312,24 +338,27 @@ $r->print(&Apache::loncommon::start_page
# ----------------------------------------------------------------------- Texts
my %lt=&Apache::lonlocal::texthash(
- 'un' => 'Username',
- 'pw' => 'Password',
- 'dom' => 'Domain',
- 'perc' => 'percent',
- 'load' => 'Server Load',
- 'userload' => 'User Load',
- 'catalog' => 'Course Catalog',
- 'log' => 'Log in',
- 'help' => 'Log-in Help',
- 'serv' => 'Server',
- 'servadm' => 'Server Administration',
- 'helpdesk' => 'Contact Helpdesk',
- 'forgotpw' => 'Forgot password?',
- 'newuser' => 'New User?',
- );
+ 'un' => 'Username',
+ 'pw' => 'Password',
+ 'dom' => 'Domain',
+ 'perc' => 'percent',
+ 'load' => 'Server Load',
+ 'userload' => 'User Load',
+ 'catalog' => 'Course/Community Catalog',
+ 'log' => 'Log in',
+ 'help' => 'Log-in Help',
+ 'serv' => 'Server',
+ 'servadm' => 'Server Administration',
+ 'helpdesk' => 'Contact Helpdesk',
+ 'forgotpw' => 'Forgot password?',
+ 'newuser' => 'New User?',
+ );
# -------------------------------------------------- Change password field name
+
my $forgotpw = &forgotpwdisplay(%lt);
-my $loginhelp = &loginhelpdisplay(%lt);
+$forgotpw .= '
' if $forgotpw;
+my $loginhelp = &loginhelpdisplay($authdomain,%lt);
+$loginhelp .= '
' if $loginhelp;
# ---------------------------------------------------- Serve out DES JavaScript
{
@@ -339,7 +368,9 @@ $r->print(<$jsh>);
# ---------------------------------------------------------- Serve rest of page
$r->print(
- '');
+ '
'
+);
#
# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
@@ -347,7 +378,7 @@ $r->print(
#
$r->print(<
+
LFORM
@@ -399,53 +429,45 @@ LFORM
if ($showbanner) {
$r->print(<
-
-
-
-
- |
-
-
+
+
+
HEADER
}
$r->print(<
-
-
+
+
$logintitle
-
- $noscript_warning
+ $loginform
+ $noscript_warning
-
- $loginhelp
- $forgotpw
- $contactblock
- $newuserlink
- $coursecatalog
+
+ $loginhelp
+ $forgotpw
+ $contactblock
+ $newuserlink
+ $coursecatalog
+
+
ENDTOP
if ($showmainlogo) {
$r->print('
'."\n");
}
$r->print(<
+
+
ENDTOP
$r->print(<
- $lt{'dom'}:
+ $lt{'dom'}:
|
$domain
@@ -453,7 +475,7 @@ $r->print(<
- $lt{'serv'}:
+ $lt{'serv'}:
|
$lonhost ($role)
@@ -461,7 +483,7 @@ $r->print(<
- $lt{'load'}:
+ $lt{'load'}:
|
$loadpercent $lt{'perc'}
@@ -469,13 +491,23 @@ $r->print(<
- $lt{'userload'}:
+ $lt{'userload'}:
|
$userloadpercent $lt{'perc'}
|
+
+
+ $version
+ |
+
| | |
+
+
+ $domainlogo
+
+
ENDSCRIPT
}
- $contactblock .= <<"ENDBLOCK";
- $version
-ENDBLOCK
return $contactblock;
}
@@ -539,10 +624,20 @@ sub forgotpwdisplay {
}
sub loginhelpdisplay {
- my (%lt) = @_;
+ my ($authdomain,%lt) = @_;
my $login_help = 1;
if ($login_help) {
- return '
'.$lt{'help'}.'';
+ my $dom = $authdomain;
+ if ($dom eq '') {
+ $dom = &Apache::lonnet::default_login_domain();
+ }
+ my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
+ my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'};
+ if ($loginhelp_url ne '') {
+ return '
'.$lt{'help'}.'';
+ } else {
+ return '
'.$lt{'help'}.'';
+ }
}
return;
}
@@ -556,7 +651,7 @@ END
sub newuser_link {
my ($linkname) = @_;
- return '
'.$linkname.'';
+ return '
'.$linkname.'';
}
1;