Diff for /loncom/interface/lonrss.pm between versions 1.53.2.5 and 1.60

version 1.53.2.5, 2021/12/14 03:22:21 version 1.60, 2021/11/30 17:35:10
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;

Removed from v.1.53.2.5  
changed lines
  Added in v.1.60


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>