Diff for /loncom/interface/lonblockingstatus.pm between versions 1.10 and 1.14

version 1.10, 2012/03/31 19:24:02 version 1.14, 2020/01/23 23:48:12
Line 44  sub handler { Line 44  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
   
     my (%activities,$activity,$origurl);      my (%activities,$activity,$origurl);
     map { $activities{$_} = 1; } ('boards','chat','msgdisplay','blogs','groups','port','docs');      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']);
Line 52  sub handler { Line 52  sub handler {
   
     my $title = 'Communication Blocking Status Information';      my $title = 'Communication Blocking Status Information';
   
     if ($activity eq 'docs') {      if (($activity eq 'docs') || ($activity eq 'printout')) {
         $title = 'Blocking Status Information';          $title = 'Blocking Status Information';
         $origurl = $env{'form.url'};          $origurl = $env{'form.url'};
     }      }
Line 78  sub blockpage { Line 78  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') {      if (($activity eq 'port') || 
           (($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'] );
   
         ($uname, $udom) = ($env{'form.uname'}, $env{'form.udom'});          ($uname, $udom) = ($env{'form.uname'}, $env{'form.udom'});
         if (($uname !~ /^$match_username$/) || ($udom !~ /^$match_domain$/)) {          if (($uname !~ /^$match_username$/) || ($udom !~ /^$match_domain$/)) {
             return '<span class="LC_error">'.              if ($activity eq 'port') {
                    &mt('Information about the owner of the portfolio files you were trying to view was missing or invalid.').                  return '<span class="LC_error">'.
                    '</span><br />'.                         &mt('Information about the owner of the portfolio files you were trying to view was missing or invalid.').
                    &mt('Without valid owner information, the reason why access is blocked can not be determined');                          '</span><br />'.
                          &mt('Without valid owner information, the reason why access is blocked can not be determined'); 
               } else {
                   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.').
                          '</span><br />'.
                          &mt('Without valid information, the reason why access is blocked can not be determined');
               }
         }          }
     }      }
   
Line 105  sub blockpage { Line 113  sub blockpage {
     my %descs = (      my %descs = (
                    boards     => 'Discussion posts in this course',                     boards     => 'Discussion posts in this course',
                    chat       => 'Chat Room',                     chat       => 'Chat Room',
                    msgdisplay => 'This message',                     com        => 'This message',
                    blogs      => 'Blogs',                     blogs      => 'Blogs',
                    groups     => 'Groups in this course',                     groups     => 'Groups in this course',
                      printout   => 'Printout generation', 
                    docs       => 'Course Content',                     docs       => 'Course Content',
                      passwd     => 'Changing of passwords',
                 );                  );
   
     if ($activity eq 'groups' || $activity eq 'boards') {      if ($activity eq 'groups' || $activity eq 'boards') {
         if (&course_type() eq 'Community') {          if (&Apache::loncommon::course_type() eq 'Community') {
             $descs{'boards'} = 'Discussion posts in this community',              $descs{'boards'} = 'Discussion posts in this community',
             $descs{'groups'} = 'Groups in this community',              $descs{'groups'} = 'Groups in this community',
             $descs{'docs'} = 'Community Content',                $descs{'docs'} = 'Community Content',  
Line 139  sub blockpage { Line 149  sub blockpage {
                          . ' 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')) {
               $output = mt( $description
                             . ' will be unavailable between [_1] and [_2] because'
                             . ' this functionality is being blocked.'
                             ,$showstart, $showend);
         } else {          } else {
             $output = mt( $description              $output = mt( $description
                           . ' will be inaccessible between [_1] and [_2] because'                            . ' will be inaccessible between [_1] and [_2] because'
Line 173  sub blockpage { Line 188  sub blockpage {
 sub build_block_table {  sub build_block_table {
     my ($setters) = @_;      my ($setters) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',          'cacb' => 'Currently active communication/content blocks',
         'cour' => 'Course',          'cour' => 'Course',
         'dura' => 'Duration',          'dura' => 'Duration',
         'blse' => 'Block set by'          'blse' => 'Block set by'
Line 196  sub build_block_table { Line 211  sub build_block_table {
             {              {
                 $fullname = Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);                  $fullname = Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
             }              }
             my $triggertype = $$setters{$course}{times}[$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)'); 
             }              }

Removed from v.1.10  
changed lines
  Added in v.1.14


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