--- loncom/interface/londocs.pm	2002/09/05 19:37:00	1.20
+++ loncom/interface/londocs.pm	2002/09/06 15:18:23	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.20 2002/09/05 19:37:00 www Exp $
+# $Id: londocs.pm,v 1.21 2002/09/06 15:18:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,8 +234,11 @@ sub handler {
     my $events='';
     my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-       ['folder','foldername','showdoc']);
-    unless ($ENV{'form.showdoc'}) { # got called from remote
+       ['folder','foldername']);
+    if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
+       $showdoc=$1;
+    }
+    unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
@@ -247,8 +250,7 @@ sub handler {
        }
     } else { # got called in sequence from course
        $allowed=0;
-       $showdoc=1;
-       $script=&Apache::lonxml::registerurl(1,undef);
+       $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonxml::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }
@@ -466,7 +468,7 @@ ENDSUPFORM
   } else {
 # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
-         &entryline(0,"Click to download or use your browser's Save Link function",$ENV{'form.showdoc'}).'</table></p>');
+         &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
   }
   $r->print('</body></html>');
   return OK;