--- loncom/interface/londocs.pm	2013/08/13 15:38:35	1.558
+++ loncom/interface/londocs.pm	2013/08/18 17:31:26	1.561
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.558 2013/08/13 15:38:35 raeburn Exp $
+# $Id: londocs.pm,v 1.561 2013/08/18 17:31:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -410,6 +410,8 @@ END
     unless ($fatal) {
         if ($folder =~ /^supplemental/) {
             &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                            $folder.'.'.$container);
         }
     }
     return ($errtext,$fatal,$fixuperrors);
@@ -1620,16 +1622,18 @@ sub dbcopy {
                     }
                 }
                 if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) {
-                    $lockerrorsref->{$prefix} = 
+                    $lockerrorsref->{$prefix} =
                         '<div class="LC_error">'.
                         &mt('There was a problem removing a lockfile.');
                     if ($prefix eq 'smppg') {
-                        $lockerrorsref->{$prefix} .= 
-                            &mt('This will prevent creation of additional simple pages in this course.');
+                        $lockerrorsref->{$prefix} .=
+                            ' '.&mt('This will prevent creation of additional simple pages in this course.');
                     } else {
-                        $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.');
+                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional bulletin boards in this course.');
                     }
-                    $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'</div>';
+                    $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                                                     '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
+                                                 '</div>';
                 }
             }
         } elsif ($url =~ m{/syllabus$}) {
@@ -3516,7 +3520,8 @@ sub new_timebased_suffix {
         }
         unless ($type eq 'paste') {
             $locknotfreed .=
-                ' '.&mt('Please contact the domain coordinator for your LON-CAPA domain.');
+                ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
+                        '<a href="/adm/helpdesk" target="_helpdesk">','</a>');
         }
         $locknotfreed .= '</div>';
     }
@@ -4181,9 +4186,9 @@ sub handler {
 # supplementalflag=0: show standard documents
 # toolsflag=1: show utilities
 
-    $env{'form.folderpath'} = &unescape($env{'form.folderpath'});
-    my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/);
-    if (($env{'form.folderpath'}=~/^default/) || ($env{'form.folderpath'} eq "")) {
+    my $unesc_folderpath = &unescape($env{'form.folderpath'});
+    my $supplementalflag=($unesc_folderpath=~/^supplemental/);
+    if (($unesc_folderpath=~/^default/) || ($unesc_folderpath eq "")) {
        $supplementalflag=0;
     }
     if ($env{'form.forcesupplement'}) { $supplementalflag=1; }