[BACK]Return to lonrss.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonrss.pm between versions 1.58 and 1.59

version 1.58, 2019/08/14 16:06:13 version 1.59, 2021/11/30 15:55:37
Line 244  sub add_blog_entry_link { Line 244  sub add_blog_entry_link {
 }  }
   
 sub blocking_blogdisplay {  sub blocking_blogdisplay {
     my ($uname,$udom,$html,$filterfeedname) = @_;      my ($uname,$udom,$html,$filterfeedname,$clientip) = @_;
     my $user = &Apache::loncommon::plainname($uname,$udom);      my $user = &Apache::loncommon::plainname($uname,$udom);
     if ($html) {      if ($html) {
         $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);          $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
Line 253  sub blocking_blogdisplay { Line 253  sub blocking_blogdisplay {
     }      }
     my %setters;      my %setters;
     my ($blocked,$output,$blockcause);      my ($blocked,$output,$blockcause);
     my ($startblock,$endblock) =      my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
              &Apache::loncommon::blockcheck(\%setters,'blogs');               &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip);
     if ($startblock && $endblock) {      if ($startblock && $endblock) {
         $blockcause = 'user';          $blockcause = 'user';
       } elsif ($by_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) =
                  &Apache::loncommon::blockcheck(\%setters,'blogs',                   &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip,
                                                 $uname,$udom);                                                  $uname,$udom);
             $blockcause = 'blogowner';              $blockcause = 'blogowner';
         }          }
     }      }
     if ($startblock && $endblock) {      if (($startblock && $endblock) || ($by_ip)) {
         $blocked = 1;          $blocked = 1;
         my $showstart = &Apache::lonlocal::locallocaltime($startblock);          if ($startblock && $endblock) {
         my $showend = &Apache::lonlocal::locallocaltime($endblock);              my $showstart = &Apache::lonlocal::locallocaltime($startblock);
         $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);              my $showend = &Apache::lonlocal::locallocaltime($endblock);
               $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);
           } else {
               $output = &mt('Blogs are unavailable from your current IP address: [_1].',$clientip);
           }
         if ($html) {$output.='<br />';}          if ($html) {$output.='<br />';}
         if ($blockcause eq 'user') {          if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
Line 277  sub blocking_blogdisplay { Line 283  sub blocking_blogdisplay {
                 #$output .= '<br />'.                  #$output .= '<br />'.
                        #&Apache::loncommon::build_block_table($startblock,                         #&Apache::loncommon::build_block_table($startblock,
                        #                                 $endblock,\%setters);                         #                                 $endblock,\%setters);
                  my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');                   my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);
                  $output .= '<br /><br />'.$blocktext;                   $output .= '<br /><br />'.$blocktext;
             }              }
           } elsif ($blockcause eq 'ip') {
               my $showdom = &Apache::lonnet::domain($blockdom);
               if ($showdom eq '') {
                   $showdom = $blockdom
               }
               $output .= &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain',$showdom);
         } else {          } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
         }          }
Line 325  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)) {
         ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);          my $clientip = &Apache::lonnet::get_requestor_ip($r); 
           ($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;
         } else {          } else {
Removed from v.1.58  
changed lines
  Added in v.1.59

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