version 1.53.2.5, 2021/12/14 03:22:21
|
version 1.59, 2021/11/30 15:55:37
|
Line 258 sub blocking_blogdisplay {
|
Line 258 sub blocking_blogdisplay {
|
if ($startblock && $endblock) { |
if ($startblock && $endblock) { |
$blockcause = 'user'; |
$blockcause = 'user'; |
} elsif ($by_ip) { |
} elsif ($by_ip) { |
$blockcause = 'ip'; |
$blockcause = 'ip'; |
} else { |
} else { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
($startblock,$endblock) = |
($startblock,$endblock) = |
Line 289 sub blocking_blogdisplay {
|
Line 289 sub blocking_blogdisplay {
|
} elsif ($blockcause eq 'ip') { |
} elsif ($blockcause eq 'ip') { |
my $showdom = &Apache::lonnet::domain($blockdom); |
my $showdom = &Apache::lonnet::domain($blockdom); |
if ($showdom eq '') { |
if ($showdom eq '') { |
$showdom = $blockdom; |
$showdom = $blockdom |
} |
} |
$output .= &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain',$showdom); |
$output .= &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain',$showdom); |
} else { |
} else { |
Line 337 sub handler {
|
Line 337 sub handler {
|
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
my ($blocked,$blocktext,$disabled,$disabletext); |
my ($blocked,$blocktext,$disabled,$disabletext); |
if (!&Apache::lonnet::is_course($udom,$uname)) { |
if (!&Apache::lonnet::is_course($udom,$uname)) { |
my $clientip = &Apache::lonnet::get_requestor_ip($r); |
my $clientip = &Apache::lonnet::get_requestor_ip($r); |
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip); |
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip); |
if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) { |
if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) { |
$disabled = 0; |
$disabled = 0; |