--- loncom/interface/loncommon.pm	2010/12/30 21:36:49	1.948.2.19
+++ loncom/interface/loncommon.pm	2011/01/05 19:57:17	1.948.2.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.948.2.19 2010/12/30 21:36:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.23 2011/01/05 19:57:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4496,7 +4496,7 @@ Returns: HTML div with $content
 sub head_subbox {
     my ($content)=@_;
     my $output =
-        '<div id="LC_head_subbox">'
+        '<div class="LC_head_subbox">'
        .$content
        .'</div>'
 }
@@ -5164,7 +5164,7 @@ td.LC_table_cell_checkbox {
   display:none;
 }
 
-#LC_head_subbox {
+.LC_head_subbox {
   clear:both;
   background: #F8F8F8; /* $sidebg; */
   border: 1px solid $sidebg;
@@ -7820,7 +7820,7 @@ sub get_secgrprole_info {
 }
 
 sub user_picker {
-    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype) = @_;
+    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
     my $currdom = $dom;
     my %curr_selected = (
                         srchin => 'dom',
@@ -7911,10 +7911,15 @@ sub user_picker {
     $srchtypesel .= "\n  </select>\n";
 
     my ($newuserscript,$new_user_create);
-
+    my $context_dom = $env{'request.role.domain'};
+    if ($context eq 'requestcrs') {
+        if ($env{'form.coursedom'} ne '') {
+            $context_dom = $env{'form.coursedom'};
+        }
+    }
     if ($forcenewuser) {
         if (ref($srch) eq 'HASH') {
-            if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+            if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $context_dom) {
                 if ($cancreate) {
                     $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
                 } else {
@@ -7953,7 +7958,7 @@ function setSearch(createnew,callingForm
             }
         }
         for (var i=0; i<callingForm.srchdomain.length; i++) {
-            if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+            if (callingForm.srchdomain.options[i].value == '$context_dom') {
                 callingForm.srchdomain.selectedIndex = i;
             }
         }
@@ -9091,7 +9096,7 @@ sub check_for_upload {
                   &mt('Unable to upload [_1]. (size = [_2] bytes)',
                       '<span class="LC_filename">'.$fname.'</span>',
                       $filesize).'<br />'.
-                  &mt('Either the file you uploaded was empty, or your web browser was unable to read its contents.').'<br />';
+                  &mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />';
                   '</span>';
         return ('zero_bytes',$msg);
     }
@@ -9101,6 +9106,11 @@ sub check_for_upload {
                                             $getpropath);
     my $found_file = 0;
     my $locked_file = 0;
+    my @lockers;
+    my $navmap;
+    if ($env{'request.course.id'}) {
+        $navmap = Apache::lonnavmaps::navmap->new();
+    }
     foreach my $line (@dir_list) {
         my ($file_name,$rest)=split(/\&/,$line,2);
         if ($file_name eq $fname){
@@ -9109,8 +9119,28 @@ sub check_for_upload {
                 $file_name = $group.$file_name;
             }
             $found_file = 1;
-            if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-                $locked_file = 1;
+            if (&Apache::lonnet::is_locked($file_name,$udom,$uname,\@lockers) eq 'true') {
+                foreach my $lock (@lockers) {
+                    if (ref($lock) eq 'ARRAY') {
+                        my ($symb,$crsid) = @{$lock};
+                        if ($crsid eq $env{'request.course.id'}) {
+                            if (ref($navmap)) {
+                                my $res = $navmap->getBySymb($symb);
+                                foreach my $part (@{$res->parts()}) {
+                                    my ($slot_status,$slot_time,$slot_name)=$res->check_for_slot($part);
+                                    unless (($slot_status == $res->RESERVED) ||
+                                            ($slot_status == $res->RESERVED_LOCATION)) {
+                                        $locked_file = 1;
+                                    }
+                                }
+                            } else {
+                                $locked_file = 1;
+                            }
+                        } else {
+                            $locked_file = 1;
+                        }
+                    }
+                }
             } else {
                 my @info = split(/\&/,$rest);
                 my $currsize = $info[6]/1000;