Diff for /loncom/interface/lonblockingstatus.pm between versions 1.14.2.2 and 1.14.2.3

version 1.14.2.2, 2020/09/08 03:57:48 version 1.14.2.3, 2020/09/28 00:27:48
Line 43  sub handler { Line 43  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
     my (%activities,$activity,$origurl);      my (%activities,$activity,$origurl,$origsymb);
     map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','passwd');      map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','passwd');
   
     # determine what kind of blocking we want details for      # determine what kind of blocking we want details for
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url','symb']);
     $activity = $env{'form.activity'};      $activity = $env{'form.activity'};
   
     my $title = 'Communication Blocking Status Information';      my $title = 'Communication Blocking Status Information';
Line 57  sub handler { Line 57  sub handler {
         $title = 'Blocking Status Information';          $title = 'Blocking Status Information';
         if ($activity eq 'docs') {          if ($activity eq 'docs') {
             $origurl = $env{'form.url'};              $origurl = $env{'form.url'};
               $origsymb = $env{'form.symb'};
         }          }
     }      }
     $r->print(&Apache::loncommon::start_page($title,undef,      $r->print(&Apache::loncommon::start_page($title,undef,
                                             {'only_body' => 1}));                                              {'only_body' => 1}));
   
     if (($activity eq '') || (!$activities{$activity})) {      if (($activity eq '') || (!$activities{$activity})) {
         $r->print('<span class="LC_error">'.&mt('Error: unknown activity type blocked').'</span>');          $r->print('<p class="LC_error">'.&mt('Error: unknown activity type blocked').'</p>');
       } 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>');
     } else {      } else {
         $r->print(&blockpage($activity,$origurl));          $r->print(&blockpage($activity,$origurl,$origsymb));
     }      }
           
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 75  sub handler { Line 78  sub handler {
   
   
 sub blockpage {  sub blockpage {
     my ($activity,$origurl) = @_;      my ($activity,$origurl,$origsymb) = @_;
   
     # 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 102  sub blockpage { Line 105  sub blockpage {
         }          }
     }      }
   
   
     # retrieve start/end of possible active blocking      # retrieve start/end of possible active blocking
     my %setters;      my (%setters,$startblock,$endblock,$triggerblock);
     my ($startblock,$endblock,$triggerblock) =   
         &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl);      if ($activity eq 'docs') {
           my ($cdom,$cnum);
           if ($env{'request.course.id'}) {
               $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
               $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
           }
           my $cancheck;
           if (($cdom ne '') && ($cnum ne '')) {
               if ($origsymb =~ m{^uploaded/($match_domain)/($match_courseid)/}) {
                   my ($crsdom,$crsnum) = ($1,$2);
                   if (($cdom eq $crsdom) && ($cnum eq $crsnum)) {
                       $cancheck = 1;
                   }
               } else {
                   $cancheck = 1;
               }
           }
           if ($cancheck) {
               ($startblock,$endblock,$triggerblock) =
                   &Apache::loncommon::blockcheck(\%setters,$activity,$cnum,$cdom,$origurl,1,$origsymb,'blockingstatus');
           } else {
               return '<p class="LC_info">'.&mt('Could not determine why access is blocked.').'</p>';
           }
       } else {
           ($startblock,$endblock,$triggerblock) = 
               &Apache::loncommon::blockcheck(\%setters,$activity,$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) { return ''; }      unless ($startblock && $endblock) {
           if ($activity eq 'docs') {
               return '<p class="LC_info">'.&mt('Content no longer blocked from access').'</p>';
           }
           return '<p class="LC_info">'.&mt('Access no longer blocked for this activity').'</p>';
       }
   
     # lookup $activity -> description      # lookup $activity -> description
                    #possible activity          #corresponding description                     #possible activity          #corresponding description

Removed from v.1.14.2.2  
changed lines
  Added in v.1.14.2.3


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