'
+ .$dom.' '.$end_page
);
return OK;
}
@@ -107,7 +119,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'};
@@ -115,7 +139,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');
@@ -170,8 +193,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
@@ -264,6 +297,7 @@ my $now=time;
my $js = (<
+//
ENDSCRIPT
@@ -310,22 +345,23 @@ $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);
@@ -339,6 +375,11 @@ $r->print(<$jsh>);
$r->print(
'
');
+#
+# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+# then just us a relative link to authenticate:
+#
+
$r->print(<
@@ -358,7 +399,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') {
@@ -376,15 +417,15 @@ my $contactblock = &contactdisplay(\%lt,
$version,$authdomain,\$helpdeskscript);
my $loginform=(<
+
LFORM
@@ -417,11 +458,13 @@ HEADER