' if $forgotpw; +my $loginhelp = &loginhelpdisplay($authdomain,%lt); +$loginhelp .= '
' if $loginhelp; # ---------------------------------------------------- Serve out DES JavaScript { @@ -347,13 +365,18 @@ $r->print(<$jsh>); } # ---------------------------------------------------------- Serve rest of page -if ($fullgraph) { $r->print( - '
');
-}
+ '
'
+);
+
+#
+# If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+# then just us a relative link to authenticate:
+#
$r->print(<
+
-
+
+
+
$logintitle
-
-
- $noscript_warning
+ $loginform
+ $noscript_warning
-| - $loginform - | -
- $loginhelp
- $forgotpw
- $contactblock
- $newuserlink - $coursecatalog
- $lt{'about'} +
-- $forgotpw
- $contactblock
- $newuserlink - $coursecatalog
- $lt{'about'} +
+ $loginhelp
+ $forgotpw
+ $contactblock
+ $newuserlink
+ $coursecatalog
+
+ENDTOP
+ if ($showmainlogo) {
+ $r->print(' 
'."\n");
+ }
+$r->print(<
+
ENDTOP -} - -if($announcements){$r->print(' ');}
-if ($fullgraph) {
$r->print(<
- $lt{'dom'}:
+ $lt{'dom'}:
$domain
@@ -462,7 +473,7 @@ $r->print(<
- $lt{'serv'}:
+ $lt{'serv'}:
$lonhost ($role)
@@ -470,7 +481,7 @@ $r->print(<
- $lt{'load'}:
+ $lt{'load'}:
$loadpercent $lt{'perc'}
@@ -478,30 +489,92 @@ $r->print(<
- $lt{'userload'}:
+ $lt{'userload'}:
$userloadpercent $lt{'perc'}
+
+
+ $version
+
+
$helpdeskscript
ENDDOCUMENT
-}
my %endargs = ( 'noredirectlink' => 1, );
$r->print(&Apache::loncommon::end_page(\%endargs));
return OK;
}
+sub check_loginvia {
+ my ($domain,$lonhost) = @_;
+ if ($domain eq '' || $lonhost eq '') {
+ return;
+ }
+ my %domconfhash = &Apache::loncommon::get_domainconf($domain);
+ my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
+ my $loginvia_exempt = $domconfhash{$domain.'.login.loginvia_exempt_'.$lonhost};
+ my $output;
+ if ($loginvia ne '') {
+ my $noredirect;
+ my $ip = $ENV{'REMOTE_ADDR'};
+ if ($ip eq '127.0.0.1') {
+ $noredirect = 1;
+ } else {
+ if ($loginvia_exempt ne '') {
+ my @exempt = split(',',$loginvia_exempt);
+ if (grep(/^\Q$ip\E$/,@exempt)) {
+ $noredirect = 1;
+ }
+ }
+ }
+ unless ($noredirect) {
+ my ($newhost,$path);
+ if ($loginvia =~ /:/) {
+ ($newhost,$path) = split(':',$loginvia);
+ } else {
+ $newhost = $loginvia;
+ }
+ if ($newhost ne $lonhost) {
+ if (&Apache::lonnet::hostname($newhost) ne '') {
+ $output = &redirect_page($newhost,$path);
+ }
+ }
+ }
+ }
+ return $output;
+}
+
+sub redirect_page {
+ my ($desthost,$path) = @_;
+ my $protocol = $Apache::lonnet::protocol{$desthost};
+ $protocol = 'http' if ($protocol ne 'https');
+ unless ($path =~ m{^/}) {
+ $path = '/'.$path;
+ }
+ my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).$path;
+ if ($env{'form.firsturl'} ne '') {
+ $url .='?firsturl='.$env{'form.firsturl'};
+ }
+ my $start_page = &Apache::loncommon::start_page('Switching Server ...',undef,
+ {'redirect' => [0,$url],});
+ my $end_page = &Apache::loncommon::end_page();
+ return $start_page.$end_page;
+}
+
sub contactdisplay {
- my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
+ my ($lt,$servadm,$showadminmail,$authdomain,$helpdeskscript) = @_;
my $contactblock;
my $showhelpdesk = 0;
my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
@@ -509,14 +582,15 @@ sub contactdisplay {
$showhelpdesk = 1;
}
if ($servadm && $showadminmail) {
- $contactblock .= ' '.$$lt{'servadm'}.':
'. - ' '.$servadm.'
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; - $version -ENDBLOCK return $contactblock; } @@ -545,10 +617,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; } @@ -562,7 +644,7 @@ END sub newuser_link { my ($linkname) = @_; - return ' '.$linkname.'
'; + return ''.$linkname.''; } 1;
ENDTOP -} - -if($announcements){$r->print('
'. - ' '.$servadm.'
'; + $contactblock .= $$lt{'servadm'}.':
'. + ''.$servadm.'
'; } if ($showhelpdesk) { $contactblock .= ''.$lt->{'helpdesk'}.'
'; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; - $version -ENDBLOCK return $contactblock; } @@ -545,10 +617,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; } @@ -562,7 +644,7 @@ END sub newuser_link { my ($linkname) = @_; - return ' '.$linkname.'
'; + return ''.$linkname.''; } 1;