Diff for /loncom/interface/loncommon.pm between versions 1.490 and 1.491

version 1.490, 2006/12/11 03:43:15 version 1.491, 2006/12/11 21:16:32
Line 3009  sub blockcheck { Line 3009  sub blockcheck {
         }          }
         # if they have the evb priv and are currently not playing student          # if they have the evb priv and are currently not playing student
         next if (($no_ownblock) &&          next if (($no_ownblock) &&
                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));                   ($env{'request.role'} !~ m{^st\./\Q$cdom\E/\Q$cnum\E}));
         next if ($no_userblock);          next if ($no_userblock);
   
         # Retrieve blocking times and identity of blocker for course          # Retrieve blocking times and identity of blocker for course
Line 3037  sub get_blocks { Line 3037  sub get_blocks {
             if ($blocks->{$activity} eq 'on') {              if ($blocks->{$activity} eq 'on') {
                 push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]);                  push(@{$$setters{$course}{'staff'}},[$staff_name,$staff_dom]);
                 push(@{$$setters{$course}{'times'}}, [$start,$end]);                  push(@{$$setters{$course}{'times'}}, [$start,$end]);
                 if ( ($startblock == 0) || ($startblock > $1) ) {                  if ( ($startblock == 0) || ($startblock > $start) ) {
                     $startblock = $1;                      $startblock = $start;
                 }                  }
                 if ( ($endblock == 0) || ($endblock < $2) ) {                  if ( ($endblock == 0) || ($endblock < $end) ) {
                     $endblock = $2;                      $endblock = $end;
                 }                  }
             }              }
         }          }

Removed from v.1.490  
changed lines
  Added in v.1.491


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