--- loncom/auth/lonlogin.pm 2010/03/31 23:18:27 1.106.4.8
+++ loncom/auth/lonlogin.pm 2010/09/02 09:24:42 1.145
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.106.4.8 2010/03/31 23:18:27 raeburn Exp $
+# $Id: lonlogin.pm,v 1.145 2010/09/02 09:24:42 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,31 +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();
- my $dest = '/adm/roles';
- if ($env{'form.firsturl'} ne '') {
- $dest = $env{'form.firsturl'};
- }
- $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
@@ -106,16 +110,7 @@ sub handler {
# ----------------------------------------------------------- Process Interface
$env{'form.interface'}=~s/\W//g;
- my $textbrowsers=$r->dir_config('lonTextBrowsers');
my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-
- foreach (split(/\:/,$textbrowsers)) {
- if ($httpbrowser=~/$_/i) {
- $env{'form.interface'}='textual';
- }
- }
-
- my $fullgraph=($env{'form.interface'} ne 'textual');
my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -127,7 +122,7 @@ sub handler {
if ($redirect) {
$r->print($redirect);
return OK;
- }
+ }
}
if (($env{'form.domain'}) &&
@@ -136,6 +131,7 @@ sub handler {
}
my $role = $r->dir_config('lonRole');
my $loadlim = $r->dir_config('lonLoadLim');
+ my $uloadlim= $r->dir_config('lonUserLoadLim');
my $servadm = $r->dir_config('lonAdmEMail');
my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');
@@ -156,17 +152,12 @@ sub handler {
}
$loadavg =~ s/\s.*//g;
my $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
+ unless ($loadlim) { $loadpercent='---'; }
my $userloadpercent=&Apache::lonnet::userload();
+ unless ($uloadlim) { $userloadpercent='---'; }
-# ------------------------------------------------------- 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();
@@ -226,461 +217,301 @@ sub handler {
' '.&mt('(preferred)').''.$/;
$last=$hostname;
}
- $spares.= '
';
- my %all_hostnames = &Apache::lonnet::all_hostnames();
- foreach my $hostid (sort
- {
- &Apache::lonnet::hostname($a) cmp
- &Apache::lonnet::hostname($b);
- }
- keys(%all_hostnames)) {
- next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
- my $hostname = &Apache::lonnet::hostname($hostid);
- next if ($last eq $hostname);
- $spares.='
'.
- $hostname.'';
- $last=$hostname;
- }
- $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;
- }
+$spares.= '
';
+my %all_hostnames = &Apache::lonnet::all_hostnames();
+foreach my $hostid (sort
+ {
+ &Apache::lonnet::hostname($a) cmp
+ &Apache::lonnet::hostname($b);
+ }
+ keys(%all_hostnames)) {
+ next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+ my $hostname = &Apache::lonnet::hostname($hostid);
+ next if ($last eq $hostname);
+ $spares.='
'.
+ $hostname.'';
+ $last=$hostname;
+}
+$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;
+}
# ----------------------------------------------- Apparently we are in business
- $servadm=~s/\,/\
/g;
+$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 $alink=&Apache::loncommon::designparm('login.alink',$domain);
- my $mainbg=
- ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
- my $sidebg=
- ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
- my $textcol =
- ($fullgraph?&Apache::loncommon::designparm('login.textcol',$domain):'#000000');
- my $bgcol =
- ($fullgraph?&Apache::loncommon::designparm('login.bgcol',$domain):'#FFFFFF');
- 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))) {
- $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
# --------------------------------------------------- Print login screen header
- my %add_entries = (topmargin => "0",
- leftmargin => "0",
- marginheight => "0",
- marginwidth => "0",
- bgcolor => "$pgbg",
- text => "$font",
- link => "$link",
- vlink => "$vlink",
- alink => "$alink",);
-
- $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
- { 'redirect' => [$expire,'/adm/roles'],
- 'add_entries' => \%add_entries,
- 'only_body' => 1,}));
+my %add_entries = (
+ bgcolor => "$mainbg",
+ text => "$font",
+ link => "$link",
+ vlink => "$vlink",
+ alink => "$alink",
+ onload => 'javascript:enableInput();',);
+
+$r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
+ { 'redirect' => [$expire,'/adm/roles'],
+ 'add_entries' => \%add_entries,
+ 'only_body' => 1,}));
# ----------------------------------------------------------------------- Texts
my %lt=&Apache::lonlocal::texthash(
- 'un' => 'Username',
- 'pw' => 'Password',
- 'dom' => 'Domain',
- 'load' => 'Server Load',
- 'userload' => 'User Load',
- 'about' => 'About LON-CAPA',
- 'access' => 'Accessibility Options',
- '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?',
- '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');
+ '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);
+
+my $forgotpw = &forgotpwdisplay(%lt);
+$forgotpw .= '
' if $forgotpw;
+my $loginhelp = &loginhelpdisplay($authdomain,%lt);
+$loginhelp .= '
' if $loginhelp;
# ---------------------------------------------------- Serve out DES JavaScript
- {
- my $jsh=Apache::File->new($include."/londes.js");
- $r->print(<$jsh>);
- }
+{
+my $jsh=Apache::File->new($include."/londes.js");
+$r->print(<$jsh>);
+}
# ---------------------------------------------------------- Serve rest of page
- if ($fullgraph) {
- $r->print(
- '
+
+
+ $domainlogo
+
+
+
ENDSCRIPT
}
- $contactblock .= <<"ENDBLOCK";
- $version
-ENDBLOCK
return $contactblock;
}
@@ -794,16 +621,26 @@ sub forgotpwdisplay {
my (%lt) = @_;
my $prompt_for_resetpw = 1;
if ($prompt_for_resetpw) {
- return '
'.$lt{'forgotpw'}.'
';
+ return ''.$lt{'forgotpw'}.'';
}
return;
}
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;
}
@@ -811,16 +648,13 @@ sub loginhelpdisplay {
sub coursecatalog_link {
my ($linkname) = @_;
return <<"END";
-
- | |
- $linkname |
-
+ $linkname
END
}
sub newuser_link {
my ($linkname) = @_;
- return ' '.$linkname.'
';
+ return ''.$linkname.'';
}
1;
