--- loncom/interface/loncommon.pm	2006/12/01 00:28:14	1.481
+++ loncom/interface/loncommon.pm	2006/12/01 20:17:47	1.482
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.481 2006/12/01 00:28:14 banghart Exp $
+# $Id: loncommon.pm,v 1.482 2006/12/01 20:17:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2804,30 +2804,77 @@ sub maketime {
 #########################################
 
 sub findallcourses {
-    my ($roles) = @_;
+    my ($roles,$uname,$udom) = @_;
     my %roles;
     if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
     my %courses;
     my $now=time;
-    foreach my $key (keys(%env)) {
-	if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} ||
-             $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)}) {
-	    my ($role,$domain,$id,$sec) = ($1,$2,$3,$4);
-	    next if ($role eq 'ca' || $role eq 'aa');
-	    next if (%roles && !exists($roles{$role}));
-	    my ($starttime,$endtime)=split(/\./,$env{$key});
-            my $active=1;
-            if ($starttime) {
-		if ($now<$starttime) { $active=0; }
-            }
-            if ($endtime) {
-                if ($now>$endtime) { $active=0; }
-            }
-            if ($active) {
-                if ($sec eq '') {
-                    $sec = 'none';
+    if (!defined($uname)) {
+        $uname = $env{'user.name'};
+    }
+    if (!defined($udom)) {
+        $udom = $env{'user.domain'};
+    }
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
+        if (!%roles) {
+            %roles = (
+                       cc => 1,
+                       in => 1,
+                       ep => 1,
+                       ta => 1,
+                       cr => 1,
+                       st => 1,
+             );
+        }
+        foreach my $entry (keys(%roleshash)) {
+            my ($trole,$tend,$tstart) = split(/_/,$roleshash{$entry});
+            if ($trole =~ /^cr/) { 
+                next if (!exists($roles{$trole}) && !exists($roles{'cr'}));
+            } else {
+                next if (!exists($roles{$trole}));
+            }
+            if ($tend) {
+                next if ($tend < $now);
+            }
+            if ($tstart) {
+                next if ($tstart > $now);
+            }
+            my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec);
+            (undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry);
+            if ($secpart eq '') {
+                ($cnum,$role) = split(/_/,$cnumpart); 
+                $sec = 'none';
+                $realsec = '';
+            } else {
+                $cnum = $cnumpart;
+                ($sec,$role) = split(/_/,$secpart);
+                $realsec = $sec;
+            }   
+            $courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec;
+        }
+    } else {
+        foreach my $key (keys(%env)) {
+	    if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} ||
+                 $key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$}) {
+	        my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4);
+	        next if ($role eq 'ca' || $role eq 'aa');
+	        next if (%roles && !exists($roles{$role}));
+	        my ($starttime,$endtime)=split(/\./,$env{$key});
+                my $active=1;
+                if ($starttime) {
+		    if ($now<$starttime) { $active=0; }
+                }
+                if ($endtime) {
+                    if ($now>$endtime) { $active=0; }
+                }
+                if ($active) {
+                    if ($sec eq '') {
+                        $sec = 'none';
+                    }
+                    $courses{$cdom.'_'.$cnum}{$sec} = 
+                                     $role.'/'.$cdom.'/'.$cnum.'/'.$sec;
                 }
-                $courses{$domain.'_'.$id}{$sec} = 1;
             }
         }
     }
@@ -2837,34 +2884,75 @@ sub findallcourses {
 ###############################################
 
 sub blockcheck {
-    my ($setters,$activity) = @_;
-    # Retrieve active student roles and active course coordinator/instructor roles
+    my ($setters,$activity,$uname,$udom) = @_;
+    # Retrieve active course roles - course coordinator, instructor, exam proctor, ta, student or custom role.
 
-    my %live_courses = &findallcourses();
+    my %live_courses = &findallcourses(undef,$uname,$udom);
 
     # Retrieve blocking times and identity of blocker for active courses
-    # unless user has 'evb' privilege.
+    # of specified user, unless user has 'evb' privilege.
 
     my $startblock = 0;
     my $endblock = 0;
 
     foreach my $course (keys(%live_courses)) {
-        my $cdom = $env{'course.'.$course.'.domain'};
-        my $cnum = $env{'course.'.$course.'.num'};
-        my $noblock = 0;
+        my ($cdom,$cnum);
+        if ((defined($env{'course.'.$course.'.domain'})) && (defined($env{'course.'.$course.'.num'}))) {
+            $cdom = $env{'course.'.$course.'.domain'};
+            $cnum = $env{'course.'.$course.'.num'};
+        } else {
+           ($cdom,$cnum) = split(/_/,$course); 
+        }
+        my $no_ownblock = 0;
+        my $no_userblock = 0;
         foreach my $sec (keys(%{$live_courses{$course}})) {
-            my $role = 'cm./'.$cdom.'/'.$cnum;
+            my $checkrole = 'cm./'.$cdom.'/'.$cnum;
             if ($sec ne 'none') {
-                $role .= '/'.$sec;
+                $checkrole .= '/'.$sec;
             }
-            if (&Apache::lonnet::allowed('evb',undef,undef,$role)) {
-                $noblock = 1;
-                last;
+            if ((defined($uname) && ($uname ne $env{'user.name'})) ||
+                 (defined($udom) && ($udom ne $env{'user.domain'}))) { 
+                my ($trole,$tdom,$tnum,$tsec);
+                my $entry = $live_courses{$course}{$sec};
+                if ($entry =~ /^cr/) {
+                    ($trole,$tdom,$tnum,$tsec) = 
+                      ($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|);
+                } else {
+                    ($trole,$tdom,$tnum,$tsec) = split(/\//,$entry);
+                }
+                my ($spec,$area,$trest,%allroles,%userroles);
+                $area = '/'.$tdom.'/'.$tnum;
+                $trest = $tnum;
+                if ($tsec ne '') {
+                    $area .= '/'.$tsec;
+                    $trest .= '/'.$tsec;
+                }
+                $spec = $trole.'.'.$area;
+                if ($trole =~ /^cr/) {
+                    &Apache::lonnet::custom_roleprivs(\%allroles,$trole,
+                                                      $tdom,$spec,$trest,$area);
+                } else {
+                    &Apache::lonnet::standard_roleprivs(\%allroles,$trole,
+                                                       $tdom,$spec,$trest,$area);
+                }
+                my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
+                    if ($1) {
+                        $no_userblock = 1;
+                        last;
+                    }
+                }
+            } else {
+                if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
+                    $no_ownblock = 1;
+                    last;
+                }
             }
         }
         # if they have the evb priv and are currently not playing student
-        next if (($noblock) &&
+        next if (($no_ownblock) &&
                  ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
+        next if ($no_userblock);
 
         $setters->{$course} = {};
         $setters->{$course}{'staff'} = [];