Diff for /loncom/interface/lonblockingstatus.pm between versions 1.14.2.2.2.1 and 1.14.2.2.2.2

version 1.14.2.2.2.1, 2020/09/08 04:04:31 version 1.14.2.2.2.2, 2020/09/29 20:17:30
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','grades','passwd');      map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','grades','passwd','search');
   
     # 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';
   
     if (($activity eq 'docs') || ($activity eq 'printout') ||      if (($activity eq 'docs') || ($activity eq 'printout') ||
         ($activity eq 'grades') || ($activity eq 'passwd')) {          ($activity eq 'grades') || ($activity eq 'passwd') ||
           ($activity eq 'search')) {
         $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());
   
     return OK;      return OK;
 }  }
   
   
 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.
     my ($uname, $udom);      my ($uname, $udom);
   
     if (($activity eq 'port') ||       if (($activity eq 'port') ||
         (($activity eq 'passwd') && ($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))) {          (($activity eq 'passwd') && ($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))) {
         &Apache::loncommon::get_unprocessed_cgi(          &Apache::loncommon::get_unprocessed_cgi(
             $ENV{'QUERY_STRING'}, ['udom', 'uname'] );              $ENV{'QUERY_STRING'}, ['udom', 'uname'] );
Line 92  sub blockpage { Line 95  sub blockpage {
                 return '<span class="LC_error">'.                  return '<span class="LC_error">'.
                        &mt('Information about the owner of the portfolio files you were trying to view was missing or invalid.').                         &mt('Information about the owner of the portfolio files you were trying to view was missing or invalid.').
                        '</span><br />'.                         '</span><br />'.
                        &mt('Without valid owner information, the reason why access is blocked can not be determined');                          &mt('Without valid owner information, the reason why access is blocked can not be determined');
             } else {              } else {
                 return '<span class="LC_error">'.                  return '<span class="LC_error">'.
                        &mt('Information about the username and/or domain for which you were trying to reset a password was missing or invalid.').                         &mt('Information about the username and/or domain for which you were trying to reset a password was missing or invalid.').
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
Line 119  sub blockpage { Line 152  sub blockpage {
                    com        => 'This message',                     com        => 'This message',
                    blogs      => 'Blogs',                     blogs      => 'Blogs',
                    groups     => 'Groups in this course',                     groups     => 'Groups in this course',
                    printout   => 'Printout generation',                      printout   => 'Printout generation',
                    docs       => 'Course Content',                     docs       => 'Course Content',
                    passwd     => 'Changing of passwords',                     passwd     => 'Changing of passwords',
                    grades     => 'Course Gradebook',                     grades     => 'Course Gradebook',
                      search     => 'Content Search',
                 );                  );
   
     if ($activity eq 'groups' || $activity eq 'boards') {      if ($activity eq 'groups' || $activity eq 'boards') {
Line 146  sub blockpage { Line 180  sub blockpage {
     my $showend   = Apache::lonlocal::locallocaltime($endblock);      my $showend   = Apache::lonlocal::locallocaltime($endblock);
   
     my $output;      my $output;
       
     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
         if ($activity eq 'docs') {          if ($activity eq 'docs') {
             $output=&mt( 'Access to the content page you are attempting to'               $output=&mt( 'Access to the content page you are attempting to'
                          . ' view will be unavailable between [_1] and [_2] because'                           . ' view will be unavailable between [_1] and [_2] because'
                          . ' access to selected '.$description.' is being blocked.'                           . ' access to selected '.$description.' is being blocked.'
                          ,$showstart, $showend);                           ,$showstart, $showend);
         } elsif (($activity eq 'printout') || ($activity eq 'passwd') || ($activity eq 'grades')) {          } elsif (($activity eq 'printout') || ($activity eq 'passwd') ||
                    ($activity eq 'grades') || ($activity eq 'search')) {
             $output = mt( $description              $output = mt( $description
                           . ' will be unavailable between [_1] and [_2] because'                            . ' will be unavailable between [_1] and [_2] because'
                           . ' this functionality is being blocked.'                            . ' this functionality is being blocked.'
Line 163  sub blockpage { Line 198  sub blockpage {
             $output = mt( $description              $output = mt( $description
                           . ' will be inaccessible between [_1] and [_2] because'                            . ' will be inaccessible between [_1] and [_2] because'
                           . ' communication is being blocked.'                            . ' communication is being blocked.'
                           ,$showstart, $showend);                              ,$showstart, $showend);
         }          }
     } else {      } else {
         # @$description is is the array returned from get_portfolio_category()          # @$description is is the array returned from get_portfolio_category()
Line 172  sub blockpage { Line 207  sub blockpage {
         $output = mt( $$description[0]          $output = mt( $$description[0]
                       . ' will be inaccessible between [_2] and [_3] because'                        . ' will be inaccessible between [_2] and [_3] because'
                       . ' communication is being blocked.'                        . ' communication is being blocked.'
                      ,$$description[1], $showstart, $showend)                         ,$$description[1], $showstart, $showend);
     }      }
   
     $output = "<p class=\"LC_info\">$output</p>";      $output = "<p class=\"LC_info\">$output</p>";
   
     # show a table containing details, except if user is trying to look       # show a table containing details, except if user is trying to look
     # at a different user's portfolio files      # at a different user's portfolio files
     if (   $activity ne 'port'                        # no portfolio      if (   $activity ne 'port'                        # no portfolio
         || (   $uname eq $env{'user.name'}            # or own portfolio          || (   $uname eq $env{'user.name'}            # or own portfolio
Line 218  sub build_block_table { Line 253  sub build_block_table {
             }              }
             my $triggertype = $$setters{$course}{triggers}[$i];              my $triggertype = $$setters{$course}{triggers}[$i];
             if ($triggertype) {              if ($triggertype) {
                 $fullname .= &mt(' (triggered by you when starting timer)');                   $fullname .= &mt(' (triggered by you when starting timer)');
             }              }
             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};              my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
             $openblock = &Apache::lonlocal::locallocaltime($openblock);              $openblock = &Apache::lonlocal::locallocaltime($openblock);

Removed from v.1.14.2.2.2.1  
changed lines
  Added in v.1.14.2.2.2.2


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