'
+ '','','','').''
.$end_page
);
- return OK;
+ return OK;
+ }
}
# ---------------------------------------------------- No valid token, continue
@@ -102,29 +111,29 @@ 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'));
+ 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'};
}
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 $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');
my $include = $r->dir_config('lonIncludes');
my $expire = $r->dir_config('lonExpire');
@@ -143,18 +152,17 @@ sub handler {
$loadavg=<$loadfile>;
}
$loadavg =~ s/\s.*//g;
- 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 ($loadpercent,$userloadpercent);
+ if ($loadlim) {
+ $loadpercent=sprintf("%.1f",100*$loadavg/$loadlim);
+ }
+ if ($uloadlim) {
+ $userloadpercent=&Apache::lonnet::userload();
+ }
+
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();
@@ -193,9 +201,13 @@ sub handler {
'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
$lonhost);
-# ------------------- If we cannot talk to ourselves, we are in serious trouble
+# -- If we cannot talk to ourselves, or hostID does not map to a hostname
+# we are in serious trouble
- if ($logtoken eq 'con_lost') {
+ if (($logtoken eq 'con_lost') || ($logtoken eq 'no_such_host')) {
+ if ($logtoken eq 'no_such_host') {
+ &Apache::lonnet::logthis('No valid logtoken for log-in page -- unable to determine hostname for hostID: '.$lonhost.'. Check entry in hosts.tab');
+ }
my $spares='';
my $last;
foreach my $hostid (sort
@@ -206,7 +218,7 @@ sub handler {
keys(%Apache::lonnet::spareid)) {
next if ($hostid eq $lonhost);
my $hostname = &Apache::lonnet::hostname($hostid);
- next if ($last eq $hostname);
+ next if (($last eq $hostname) || ($hostname eq ''));
$spares.=' '.
@@ -214,461 +226,328 @@ 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;
+ if ($spares) {
+ $spares.= ' ';
}
- $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:').'
'.&mt('This LON-CAPA server is temporarily not available for login.').'
');
+ if ($spares) {
+ $r->print('
'.&mt('Please attempt to login to one of the following servers:')
+ .'
'
+ .$spares);
+ }
+ $r->print(''
+ .''
+ );
+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 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(
- '
');
- }
+$r->print(
+ '
'
+);
+
+#
+# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+# then just us a relative link to authenticate:
+#
- $r->print(<
+$r->print(<
-
-
-
-
-
-
-
ENDSERVERFORM
- my $coursecatalog;
- if (($showcoursecat eq '') || ($showcoursecat)) {
- $coursecatalog = &coursecatalog_link($lt{'catalog'});
- }
- my $newuserlink;
- if ($shownewuserlink) {
- $newuserlink = &newuser_link($lt{'newuser'});
- }
- if ($fullgraph) {
- $r->print(<
-