--- loncom/homework/lonhomework.pm	2006/05/16 21:21:32	1.248
+++ loncom/homework/lonhomework.pm	2006/06/12 18:45:35	1.250
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.248 2006/05/16 21:21:32 albertel Exp $
+# $Id: lonhomework.pm,v 1.250 2006/06/12 18:45:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,9 +170,14 @@ sub proctor_checked_in {
     } elsif ($type eq 'problem') {
 	$key ='resource.0.checkedin';
     }
-    
+    # backward compatability, used to be username@domain, 
+    # now is username:domain
+    my $who = $Apache::lonhomework::history{$key};
+    if ($who !~ /:/) {
+	$who =~ tr/@/:/;
+    }     
     foreach my $possible (@possible_proctors) { 
-	if ($Apache::lonhomework::history{$key} eq $possible
+	if ($who eq $possible
 	    && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
 	    return 1;
 	}
@@ -481,11 +486,13 @@ sub check_access {
 }
 # this should work exactly like the copy in lonnavmaps.pm
 sub due_date {
-    my ($part_id,$symb)=@_;
+    my ($part_id,$symb,$udom,$uname)=@_;
     my $date;
-    my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb);
+    my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
+				       $udom,$uname);
     &Apache::lonxml::debug("looking for interval $part_id $symb $interval");
-    my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb);
+    my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
+				       $udom,$uname);
     &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
     if (defined($interval)) {
 	my $first_access=&Apache::lonnet::get_first_access('map',$symb);