Diff for /loncom/interface/lonblockingstatus.pm between versions 1.14.2.6 and 1.15

version 1.14.2.6, 2021/12/24 21:32:03 version 1.15, 2020/08/10 19:28:21
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,$origsymb);      my (%activities,$activity,$origurl);
     map { $activities{$_} = 1; } ('boards','chat','com','blogs','about','groups','port','printout','docs','grades','passwd','search','wishlist','annotate');      map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','grades','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','symb']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']);
     $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 'search') || ($activity eq 'wishlist') ||  
         ($activity eq 'annotate')) {  
         $title = 'Blocking Status Information';          $title = 'Blocking Status Information';
         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('<p class="LC_error">'.&mt('Error: unknown activity type blocked').'</p>');          $r->print('<span class="LC_error">'.&mt('Error: unknown activity type blocked').'</span>');
     } 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 {
         my $clientip = &Apache::lonnet::get_requestor_ip($r);          $r->print(&blockpage($activity,$origurl));
         $r->print(&blockpage($activity,$origurl,$origsymb,$clientip));  
     }      }
       
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
   
     return OK;      return OK;
 }  }
   
   
 sub blockpage {  sub blockpage {
     my ($activity,$origurl,$origsymb,$clientip) = @_;      my ($activity,$origurl) = @_;
   
     # 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') || ($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 97  sub blockpage { Line 89  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 112  sub blockpage { Line 99  sub blockpage {
         }          }
     }      }
   
     # retrieve start/end of possible active blocking  
     my (%setters,$startblock,$endblock,$triggerblock,$by_ip,$blockdom);  
   
     if ($activity eq 'docs') {      # retrieve start/end of possible active blocking
         my ($cdom,$cnum);      my %setters;
         if ($env{'request.course.id'}) {      my ($startblock,$endblock,$triggerblock) = 
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};          &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl);
             $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,$clientip,$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,$by_ip,$blockdom) =  
             &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) || ($by_ip)) {      unless ($startblock && $endblock) { return ''; }
         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 158  sub blockpage { Line 115  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',
                    search     => 'Content Search',  
                    wishlist   => 'Stored Links',  
                    annotate   => 'Annotations',  
                 );                  );
   
     if ($activity eq 'groups' || $activity eq 'boards') {      if ($activity eq 'groups' || $activity eq 'boards') {
Line 174  sub blockpage { Line 127  sub blockpage {
             $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';
             $descs{'grades'} = 'Community Gradebook';              $descs{'grades'} = 'Community Gradebook'; 
         }          }
     }      }
   
     my $description = $descs{$activity};      my $description = $descs{$activity};
     if ($activity eq 'port') {      if ($activity eq 'port') {
         $description = &get_portfolio_category($uname,$udom,$by_ip,\%setters);          $description = &get_portfolio_category($uname,$udom,\%setters);
     }      }
     if ($description eq '') {      if ($description eq '') {
         $description = 'Communication';          $description = 'Communication';
     }      }
   
     my ($showstart,$showend,$output);      my $showstart = Apache::lonlocal::locallocaltime($startblock);
     unless ($by_ip) {      my $showend   = Apache::lonlocal::locallocaltime($endblock);
         $showstart = Apache::lonlocal::locallocaltime($startblock);  
         $showend   = Apache::lonlocal::locallocaltime($endblock);  
     }  
   
       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') ||          } elsif (($activity eq 'printout') || ($activity eq 'passwd') || ($activity eq 'grades')) {
                  ($activity eq 'grades') || ($activity eq 'search') ||              $output = mt( $description
                  ($activity eq 'about') || ($activity eq 'wishlist') ||                            . ' will be unavailable between [_1] and [_2] because'
                  ($activity eq 'annotate')) {                            . ' this functionality is being blocked.'
             if ($by_ip) {                            ,$showstart, $showend);
                 $output = mt( $description  
                               . ' unavailable from your current IP address: [_1] '  
                               . '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 {
             if ($by_ip) {              $output = mt( $description
                 $output = mt( $description                            . ' will be inaccessible between [_1] and [_2] because'
                               . ' unavailable from your current IP address: [_1] '                            . ' communication is being blocked.'
                               . 'because communication is being blocked for certain IP address(es).'                            ,$showstart, $showend);  
                               ,$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]
         if ($by_ip) {          $output = mt( $$description[0]
             $output = mt( $$description[0]                        . ' will be inaccessible between [_2] and [_3] because'
                           . ' are inaccessible from your current IP address: [_2] '                        . ' communication is being blocked.'
                           . 'because communication is being blocked for certain IP address(es).'                       ,$$description[1], $showstart, $showend)  
                           , $$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>";
   
     # 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
             && $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
     {      {
         if ($by_ip) {          $output .= &build_block_table(\%setters);
             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 297  sub build_block_table { Line 215  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);
Line 314  sub build_block_table { Line 232  sub build_block_table {
 }  }
   
 sub get_portfolio_category {  sub get_portfolio_category {
     my ($uname, $udom, $by_ip, $setters) = @_;      my ($uname, $udom, $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 326  sub get_portfolio_category { Line 244  sub get_portfolio_category {
   
         my $coursedesc;          my $coursedesc;
   
         if ($by_ip) {          foreach my $course (keys(%{$setters})) {
             my %courseinfo = Apache::lonnet::coursedescription($udom.'_'.$uname);              my %courseinfo = Apache::lonnet::coursedescription($course);
             $coursedesc    = $courseinfo{'description'};              $coursedesc    = $courseinfo{'description'};
         } else {  
             foreach my $course (keys(%{$setters})) {  
                 my %courseinfo = Apache::lonnet::coursedescription($course);  
                 $coursedesc    = $courseinfo{'description'};  
             }  
         }          }
   
         return ["Group portfolio files in the course '[_1]'", $coursedesc];          return ["Group portfolio in the course '[_1]'", $coursedesc];
                   
     } else {      } else {
         # different user's portfolio files          # different user's portfolio files

Removed from v.1.14.2.6  
changed lines
  Added in v.1.15


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