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

Diff for /loncom/interface/lonblockingstatus.pm between versions 1.12 and 1.13

version 1.12, 2013/01/15 18:24:15 version 1.13, 2016/01/27 00:24:09
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','printout','docs');      map { $activities{$_} = 1; } ('boards','chat','msgdisplay','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 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 110  sub blockpage { Line 118  sub blockpage {
                    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',
                 );                  );
   
     if ($activity eq 'groups' || $activity eq 'boards') {      if ($activity eq 'groups' || $activity eq 'boards') {
Line 140  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') {          } elsif (($activity eq 'printout') || ($activity eq 'passwd')) {
             $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.'
Removed from v.1.12  
changed lines
  Added in v.1.13

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