version 1.1075.2.72, 2014/05/15 20:37:22
|
version 1.1075.2.73, 2014/05/16 18:36:05
|
Line 4236 sub findallcourses {
|
Line 4236 sub findallcourses {
|
############################################### |
############################################### |
|
|
sub blockcheck { |
sub blockcheck { |
my ($setters,$activity,$uname,$udom,$url) = @_; |
my ($setters,$activity,$uname,$udom,$url,$is_course) = @_; |
|
|
if (!defined($udom)) { |
if (defined($udom) && defined($uname)) { |
|
# If uname and udom are for a course, check for blocks in the course. |
|
if (($is_course) || (&Apache::lonnet::is_course($udom,$uname))) { |
|
my ($startblock,$endblock,$triggerblock) = |
|
&get_blocks($setters,$activity,$udom,$uname,$url); |
|
return ($startblock,$endblock,$triggerblock); |
|
} |
|
} else { |
$udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
} |
|
if (!defined($uname)) { |
|
$uname = $env{'user.name'}; |
$uname = $env{'user.name'}; |
} |
} |
|
|
# If uname and udom are for a course, check for blocks in the course. |
|
|
|
if (&Apache::lonnet::is_course($udom,$uname)) { |
|
my ($startblock,$endblock,$triggerblock) = |
|
&get_blocks($setters,$activity,$udom,$uname,$url); |
|
return ($startblock,$endblock,$triggerblock); |
|
} |
|
|
|
my $startblock = 0; |
my $startblock = 0; |
my $endblock = 0; |
my $endblock = 0; |
my $triggerblock = ''; |
my $triggerblock = ''; |
Line 4262 sub blockcheck {
|
Line 4259 sub blockcheck {
|
# boards, chat or groups, check for blocking in current course only. |
# boards, chat or groups, check for blocking in current course only. |
|
|
if (($activity eq 'boards' || $activity eq 'chat' || |
if (($activity eq 'boards' || $activity eq 'chat' || |
$activity eq 'groups') && ($env{'request.course.id'})) { |
$activity eq 'groups' || $activity eq 'printout') && |
|
($env{'request.course.id'})) { |
foreach my $key (keys(%live_courses)) { |
foreach my $key (keys(%live_courses)) { |
if ($key ne $env{'request.course.id'}) { |
if ($key ne $env{'request.course.id'}) { |
delete($live_courses{$key}); |
delete($live_courses{$key}); |
Line 4526 sub parse_block_record {
|
Line 4524 sub parse_block_record {
|
} |
} |
|
|
sub blocking_status { |
sub blocking_status { |
my ($activity,$uname,$udom,$url) = @_; |
my ($activity,$uname,$udom,$url,$is_course) = @_; |
my %setters; |
my %setters; |
|
|
# check for active blocking |
# check for active blocking |
my ($startblock,$endblock,$triggerblock) = |
my ($startblock,$endblock,$triggerblock) = |
&blockcheck(\%setters,$activity,$uname,$udom,$url); |
&blockcheck(\%setters,$activity,$uname,$udom,$url,$is_course); |
my $blocked = 0; |
my $blocked = 0; |
if ($startblock && $endblock) { |
if ($startblock && $endblock) { |
$blocked = 1; |
$blocked = 1; |
Line 7425 sub print_suppression {
|
Line 7423 sub print_suppression {
|
} |
} |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $blocked = &blocking_status('printout',$cnum,$cdom); |
my $blocked = &blocking_status('printout',$cnum,$cdom,undef,1); |
if ($blocked) { |
if ($blocked) { |
my $checkrole = "cm./$cdom/$cnum"; |
my $checkrole = "cm./$cdom/$cnum"; |
if ($env{'request.course.sec'} ne '') { |
if ($env{'request.course.sec'} ne '') { |