version 1.106.4.4, 2010/02/09 17:46:44
|
version 1.106.4.7, 2010/03/10 02:49:49
|
Line 120 sub handler {
|
Line 120 sub handler {
|
my $iconpath= |
my $iconpath= |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
|
|
|
my $lonhost = $r->dir_config('lonHostID'); |
my $domain = &Apache::lonnet::default_login_domain(); |
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'}) && |
if (($env{'form.domain'}) && |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
(&Apache::lonnet::domain($env{'form.domain'},'description'))) { |
$domain=$env{'form.domain'}; |
$domain=$env{'form.domain'}; |
Line 128 sub handler {
|
Line 137 sub handler {
|
my $role = $r->dir_config('lonRole'); |
my $role = $r->dir_config('lonRole'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $loadlim = $r->dir_config('lonLoadLim'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $lonhost = $r->dir_config('lonHostID'); |
|
my $tabdir = $r->dir_config('lonTabDir'); |
my $tabdir = $r->dir_config('lonTabDir'); |
my $include = $r->dir_config('lonIncludes'); |
my $include = $r->dir_config('lonIncludes'); |
my $expire = $r->dir_config('lonExpire'); |
my $expire = $r->dir_config('lonExpire'); |
Line 374 my %lt=&Apache::lonlocal::texthash(
|
Line 382 my %lt=&Apache::lonlocal::texthash(
|
'userload' => 'User Load', |
'userload' => 'User Load', |
'about' => 'About LON-CAPA', |
'about' => 'About LON-CAPA', |
'access' => 'Accessibility Options', |
'access' => 'Accessibility Options', |
'catalog' => 'Course Catalog', |
'catalog' => 'Course/Community Catalog', |
'log' => 'Log in', |
'log' => 'Log in', |
'help' => 'Log-in Help', |
'help' => 'Log-in Help', |
'serv' => 'Server', |
'serv' => 'Server', |
Line 689 ENDDOCUMENT
|
Line 697 ENDDOCUMENT
|
return OK; |
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 { |
sub contactdisplay { |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_; |
my $contactblock; |
my $contactblock; |
Line 749 sub coursecatalog_link {
|
Line 813 sub coursecatalog_link {
|
return <<"END"; |
return <<"END"; |
<tr> |
<tr> |
<td> </td> |
<td> </td> |
<td><a href="/adm/coursecatalog"><b>$linkname</b></a></td> |
<td><span class="LC_nobreak"><a href="/adm/coursecatalog"><b>$linkname</b></a></span></td> |
</tr> |
</tr> |
END |
END |
} |
} |