'
- .'' 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( - '
|
+ if ($showbanner) {
+ $r->print(<
+
HEADER
- if ($showbanner) {
- $r->print(< | |||||||||||||||||||||||||
| - - - |  |
-
-
-  |
-
-
-  |
- ||||||||||||||||||||||
-
|
-
-
-  |
-
-
-
-
-ENDSTART
- if ($showmainlogo) {
- $r->print(<
+ $logintitle
+ $loginform
+ $noscript_warning
+
+
+
+ $loginhelp
+ $forgotpw
+ $contactblock
+ $newuserlink
+ $coursecatalog
+
+
-
- |
-  | ||||||||||||||||||||||
|
+
ENDTOP
- } else {
- $r->print(' The LearningOnline Network with CAPA' - .''.&mt('Text-based Interface Login').'' - .$announcements); - } - $r->print(' -ENDLOGIN - if ($fullgraph) { - my $helpdeskscript; - my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail, - $version,$authdomain,\$helpdeskscript); - $r->print(< |
-
-
-$announcements |
-
-
- |
- | ||||||||||||||||||||||
|
- -
- $contactblock - - - - |
-
-
-
-$domainlogo
- |
-
-
- |
-
- |
-
-
- |
-
-
-  |
-
-
-  |
- 
+ $domainlogo
+
+ + $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'}; @@ -681,14 +592,15 @@ sub contactdisplay { $showhelpdesk = 1; } if ($servadm && $showadminmail) { - $contactblock .= ' '.$$lt{'servadm'}.': '. - ' '.$servadm.' '; + $contactblock .= $$lt{'servadm'}.': '. + ''.$servadm.' '; } if ($showhelpdesk) { - $contactblock .= ' '.$lt->{'helpdesk'}.' '; + $contactblock .= ''.$lt->{'helpdesk'}.' '; my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT } - $contactblock .= <<"ENDBLOCK"; - $version -ENDBLOCK return $contactblock; } @@ -711,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; } @@ -728,16 +648,13 @@ sub loginhelpdisplay { sub coursecatalog_link { my ($linkname) = @_; return <<"END"; - | ||||||||||||||||||
| - | $linkname | -||||||||||||||||||||||||