--- loncom/auth/lonlogin.pm 2009/09/11 23:04:45 1.125
+++ loncom/auth/lonlogin.pm 2009/12/01 14:23:49 1.130
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.125 2009/09/11 23:04:45 raeburn Exp $
+# $Id: lonlogin.pm,v 1.130 2009/12/01 14:23:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -111,7 +111,19 @@ sub handler {
my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ my $lonhost = $r->dir_config('lonHostID');
my $domain = &Apache::lonnet::default_login_domain();
+ my %domconfhash = &Apache::loncommon::get_domainconf($domain);
+ if ($lonhost ne '') {
+ my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
+ if (($loginvia ne '') && ($loginvia ne $lonhost)) {
+ if (&Apache::lonnet::hostname($loginvia) ne '') {
+ $r->print(&redirect_page($loginvia));
+ return OK;
+ }
+ }
+ }
+
if (($env{'form.domain'}) &&
(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
$domain=$env{'form.domain'};
@@ -119,7 +131,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');
@@ -326,21 +337,21 @@ $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);
@@ -379,7 +390,7 @@ if (($showcoursecat eq '') || ($showcour
}
my $newuserlink;
if ($shownewuserlink) {
- $newuserlink = &newuser_link($lt{'newuser'}).'
';
+ $newuserlink = &newuser_link($lt{'newuser'});
}
my $logintitle;
if ($loginheader eq 'text') {
@@ -401,11 +412,11 @@ my $loginform=(<
-
+
:
-
+
:
-
+
LFORM
@@ -438,11 +449,13 @@ HEADER