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

Diff for /loncom/interface/lonblockingstatus.pm between versions 1.14.2.2.2.3 and 1.17

version 1.14.2.2.2.3, 2021/01/04 17:26:22 version 1.17, 2020/09/28 00:10:28
Line 44  sub handler { Line 44  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
   
     my (%activities,$activity,$origurl,$origsymb);      my (%activities,$activity,$origurl,$origsymb);
     map { $activities{$_} = 1; } ('boards','chat','com','blogs','about','groups','port','printout','docs','grades','passwd','search');      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','symb']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url','symb']);
Line 71  sub handler { Line 71  sub handler {
     } else {      } else {
         $r->print(&blockpage($activity,$origurl,$origsymb));          $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,$origsymb) = @_;      my ($activity,$origurl,$origsymb) = @_;
   
Line 84  sub blockpage { Line 85  sub blockpage {
     # 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') || ($activity eq 'about') ||      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 95  sub blockpage { Line 96  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'); 
             } elsif ($activity eq 'about') {  
                 return '<span class="LC_error">'.  
                        &mt('The username and/or domain for the User Information page you were trying to view was missing or invalid.').  
                        '</span><br />'.  
                        &mt('Without valid 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 137  sub blockpage { Line 133  sub blockpage {
             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) = 
             &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus');              &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) {      unless ($startblock && $endblock) { 
         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 156  sub blockpage { Line 152  sub blockpage {
                    chat       => 'Chat Room',                     chat       => 'Chat Room',
                    com        => 'This message',                     com        => 'This message',
                    blogs      => 'Blogs',                     blogs      => 'Blogs',
                    about      => 'User information pages',  
                    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',
Line 190  sub blockpage { Line 185  sub blockpage {
     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') ||          } elsif (($activity eq 'printout') || ($activity eq 'passwd') ||
                  ($activity eq 'grades') || ($activity eq 'search') ||                   ($activity eq 'grades') || ($activity eq 'search')) {
                  ($activity eq 'about')) {  
             $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 205  sub blockpage { Line 199  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 214  sub blockpage { Line 208  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 260  sub build_block_table { Line 254  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.3  
changed lines
  Added in v.1.17

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