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

Diff for /loncom/interface/lonblockingstatus.pm between versions 1.19 and 1.20

version 1.19, 2021/01/02 21:07:36 version 1.20, 2021/11/30 15:55:37
Line 69  sub handler { Line 69  sub handler {
     } elsif (($activity eq 'docs') && ($origurl eq '') && ($origsymb eq '')) {      } elsif (($activity eq 'docs') && ($origurl eq '') && ($origsymb eq '')) {
         $r->print('<p class="LC_error">'.&mt('Error: could not determine what content was blocked from access').'</p>');          $r->print('<p class="LC_error">'.&mt('Error: could not determine what content was blocked from access').'</p>');
     } else {      } else {
         $r->print(&blockpage($activity,$origurl,$origsymb));          my $clientip = &Apache::lonnet::get_requestor_ip($r);
           $r->print(&blockpage($activity,$origurl,$origsymb,$clientip));
     }      }
   
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 78  sub handler { Line 79  sub handler {
 }  }
   
 sub blockpage {  sub blockpage {
     my ($activity,$origurl,$origsymb) = @_;      my ($activity,$origurl,$origsymb,$clientip) = @_;
   
     # in case of a portfolio block we need to determine the owner of the files      # in case of a portfolio block we need to determine the owner of the files
     # we're trying to look at. This information is passed via query string.      # we're trying to look at. This information is passed via query string.
Line 111  sub blockpage { Line 112  sub blockpage {
     }      }
   
     # retrieve start/end of possible active blocking      # retrieve start/end of possible active blocking
     my (%setters,$startblock,$endblock,$triggerblock);      my (%setters,$startblock,$endblock,$triggerblock,$by_ip,$blockdom);
   
     if ($activity eq 'docs') {      if ($activity eq 'docs') {
         my ($cdom,$cnum);          my ($cdom,$cnum);
Line 132  sub blockpage { Line 133  sub blockpage {
         }          }
         if ($cancheck) {          if ($cancheck) {
             ($startblock,$endblock,$triggerblock) =              ($startblock,$endblock,$triggerblock) =
                 &Apache::loncommon::blockcheck(\%setters,$activity,$cnum,$cdom,$origurl,1,$origsymb,'blockingstatus');                  &Apache::loncommon::blockcheck(\%setters,$activity,$clientip,$cnum,$cdom,$origurl,1,$origsymb,'blockingstatus');
         } else {          } else {
             return '<p class="LC_info">'.&mt('Could not determine why access is blocked.').'</p>';              return '<p class="LC_info">'.&mt('Could not determine why access is blocked.').'</p>';
         }          }
     } else {      } else {
         ($startblock,$endblock,$triggerblock) =          ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
             &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus');              &Apache::loncommon::blockcheck(\%setters,$activity,$clientip,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus');
     }      }
   
     # nothing to do if there's no active blocking      # nothing to do if there's no active blocking
     unless ($startblock && $endblock) {      unless (($startblock && $endblock) || ($by_ip)) {
         if ($activity eq 'docs') {          if ($activity eq 'docs') {
             return '<p class="LC_info">'.&mt('Content no longer blocked from access').'</p>';              return '<p class="LC_info">'.&mt('Content no longer blocked from access').'</p>';
         }          }
Line 176  sub blockpage { Line 177  sub blockpage {
   
     my $description = $descs{$activity};      my $description = $descs{$activity};
     if ($activity eq 'port') {      if ($activity eq 'port') {
         $description = &get_portfolio_category($uname,$udom,\%setters);          $description = &get_portfolio_category($uname,$udom,$by_ip,\%setters);
     }      }
     if ($description eq '') {      if ($description eq '') {
         $description = 'Communication';          $description = 'Communication';
     }      }
   
     my $showstart = Apache::lonlocal::locallocaltime($startblock);      my ($showstart,$showend,$output);
     my $showend   = Apache::lonlocal::locallocaltime($endblock);      unless ($by_ip) {
           $showstart = Apache::lonlocal::locallocaltime($startblock);
     my $output;          $showend   = Apache::lonlocal::locallocaltime($endblock);
       }
   
     if ( ref($description) ne 'ARRAY' ) {      if ( ref($description) ne 'ARRAY' ) {
         #default: $description is one of the above descriptions          #default: $description is one of the above descriptions
Line 197  sub blockpage { Line 199  sub blockpage {
         } elsif (($activity eq 'printout') || ($activity eq 'passwd') ||          } elsif (($activity eq 'printout') || ($activity eq 'passwd') ||
                  ($activity eq 'grades') || ($activity eq 'search') ||                   ($activity eq 'grades') || ($activity eq 'search') ||
                  ($activity eq 'about')) {                   ($activity eq 'about')) {
             $output = mt( $description              if ($by_ip) {
                           . ' will be unavailable between [_1] and [_2] because'                  $output = mt( $description
                           . ' this functionality is being blocked.'                                . ' unavailable from your current IP address: [_1] '
                           ,$showstart, $showend);                                . 'because this functionality is being blocked for certain IP address(es).'
                                 ,$clientip);
               } else {
                   $output = mt( $description
                                 . ' will be unavailable between [_1] and [_2] because'
                                 . ' this functionality is being blocked.'
                                 ,$showstart, $showend);
               }
         } else {          } else {
             $output = mt( $description              if ($by_ip) {
                           . ' will be inaccessible between [_1] and [_2] because'                  $output = mt( $description
                           . ' communication is being blocked.'                                . ' unavailable from your current IP address: [_1] '
                           ,$showstart, $showend);                                . 'because communication is being blocked for certain IP address(es).'
                                 ,$clientip);
               } else {
                   $output = mt( $description
                                 . ' will be inaccessible between [_1] and [_2] because'
                                 . ' communication is being blocked.'
                                 ,$showstart, $showend);
               }
         }          }
     } else {      } else {
         # @$description is is the array returned from get_portfolio_category()          # @$description is is the array returned from get_portfolio_category()
         # and contains the description (e.g. "Portfolio files belonging to [_1]"          # and contains the description (e.g. "Portfolio files belonging to [_1]"
         # and the value for [_1]          # and the value for [_1]
         $output = mt( $$description[0]          if ($by_ip) {
                       . ' will be inaccessible between [_2] and [_3] because'              $output = mt( $$description[0]
                       . ' communication is being blocked.'                            . ' are inaccessible from your current IP address: [_2] '
                      ,$$description[1], $showstart, $showend);                            . 'because communication is being blocked for certain IP address(es).'
                             , $$description[1], $clientip);
           } else {
               $output = mt( $$description[0]
                             . ' will be inaccessible between [_2] and [_3] because'
                             . ' communication is being blocked.'
                             ,$$description[1], $showstart, $showend);
           }
     }      }
   
     $output = "<p class=\"LC_info\">$output</p>";      $output = "<p class=\"LC_info\">$output</p>";
Line 226  sub blockpage { Line 249  sub blockpage {
             && $udom  eq $env{'user.domain'} )               && $udom  eq $env{'user.domain'} ) 
         || Apache::lonnet::is_course($udom, $uname) ) # or portfolio of a course          || Apache::lonnet::is_course($udom, $uname) ) # or portfolio of a course
     {      {
         $output .= &build_block_table(\%setters);          if ($by_ip) {
               my $showdom = &Apache::lonnet::domain($blockdom);
               if ($showdom eq '') {
                   $showdom = $blockdom
               }
               $output .= '<br />'.
                          &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.'
                             ,$showdom);
           } else {
               $output .= &build_block_table(\%setters);
           }
     }      }
   
     return $output;      return $output;
Line 277  sub build_block_table { Line 310  sub build_block_table {
 }  }
   
 sub get_portfolio_category {  sub get_portfolio_category {
     my ($uname, $udom, $setters) = @_;      my ($uname, $udom, $by_ip, $setters) = @_;
   
     if ($uname eq $env{'user.name'} && $udom eq $env{'user.domain'}) {      if ($uname eq $env{'user.name'} && $udom eq $env{'user.domain'}) {
         # user's portolfio files          # user's portolfio files
Line 289  sub get_portfolio_category { Line 322  sub get_portfolio_category {
   
         my $coursedesc;          my $coursedesc;
   
         foreach my $course (keys(%{$setters})) {          if ($by_ip) {
             my %courseinfo = Apache::lonnet::coursedescription($course);              my %courseinfo = Apache::lonnet::coursedescription($udom.'_'.$uname);
             $coursedesc    = $courseinfo{'description'};              $coursedesc    = $courseinfo{'description'};
           } else {        
               foreach my $course (keys(%{$setters})) {
                   my %courseinfo = Apache::lonnet::coursedescription($course);
                   $coursedesc    = $courseinfo{'description'};
               }
         }          }
   
         return ["Group portfolio in the course '[_1]'", $coursedesc];          return ["Group portfolio files in the course '[_1]'", $coursedesc];
                   
     } else {      } else {
         # different user's portfolio files          # different user's portfolio files
Removed from v.1.19  
changed lines
  Added in v.1.20

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