--- loncom/interface/londocs.pm	2002/09/04 14:50:53	1.17
+++ 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.17 2002/09/04 14:50:53 www Exp $
+# $Id: londocs.pm,v 1.21 2002/09/06 15:18:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -198,6 +198,7 @@ END
 	  $url=&Apache::lonnet::tokenwrapper($url);
        } 
     }
+    $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
 # Title
     $title=&Apache::lonnet::unescape($title);
     my $foldertitle=$title;
@@ -231,9 +232,13 @@ sub handler {
     my $script='';
     my $allowed;
     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_/);
 
@@ -245,9 +250,7 @@ sub handler {
        }
     } else { # got called in sequence from course
        $allowed=0;
-       $forcestandard=1;
-       $forcesupplement=0;
-       $script=&Apache::&Apache::lonxml::registerurl(1,undef);
+       $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
        $events='onLoad="'.&Apache::lonxml::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }
@@ -274,7 +277,11 @@ sub handler {
 <title>The LearningOnline Network with CAPA</title>
 <script>
 $script
-
+</script>
+ENDDOCUMENT
+   if ($allowed) {
+    $r->print(<<ENDNEWSCRIPT);
+<script>
 function makenewfolder(targetform,folderseq) {
     var foldername=prompt('Name of New Folder','New Folder');
     if (foldername) {
@@ -283,12 +290,26 @@ function makenewfolder(targetform,folder
     }
 }
 
-function makenewext(targetform) {
+function makenewext(targetname) {
+    this.document.forms.extimport.useform.value=targetname;
+    window.open('/adm/rat/extpickframe.html');
+}
+
+function finishpick() {
+    var title=this.document.forms.extimport.title.value;
+    var url=this.document.forms.extimport.url.value;
+    var form=this.document.forms.extimport.useform.value;
+    eval
+     ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
+    '";this.document.forms.'+form+'.submit();');
 }
 </script>
-</head>
-ENDDOCUMENT
-$r->print(&Apache::loncommon::bodytag('Course Documents','',$events));
+ENDNEWSCRIPT
+  }
+# -------------------------------------------------------------------- Body tag
+  $r->print('</head>'.
+            &Apache::loncommon::bodytag('Course Documents','',$events));
+  unless ($showdoc) {
 # --------------------------------------------------------- Standard documents
     if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<h2>Main Course Documents</h2>');
@@ -338,7 +359,7 @@ value="New Folder" />
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
-<input name="newext" type="button" onClick="javascript:makenewext(this.form);"
+<input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="External Resource" />
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
@@ -349,9 +370,11 @@ value="Syllabus=/public/$coursedom/$cour
 <input name="newsyl" type="submit" value="Syllabus" />
 </form>
 <form action="/adm/coursedocs" method="post" name="newnav">
+<input type="hidden" name="folder" value="$folder">
+<input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
-<input name="newsyl" type="submit" value="Navigate Content" />
+<input name="newnav" type="submit" value="Navigate Content" />
 </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">
 <input type="hidden" name="folder" value="$folder">
@@ -404,7 +427,7 @@ ENDFORM
 "javascript:groupimport();" value="Import">
 </form>
 </td><td bgcolor="#DDDDDD">
-<form action="/adm/coursedocs" method="post" name="newfolder">
+<form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
@@ -412,21 +435,22 @@ ENDFORM
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="New Folder" />
 </form>
-<form action="/adm/coursedocs" method="post" name="newext">
+<form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
-<input name="newext" type="button" onClick="javascript:makenewext(this.form);"
+<input name="newext" type="button" 
+onClick="javascript:makenewext('supnewext');"
 value="External Resource" />
 </form>
-<form action="/adm/coursedocs" method="post" name="newsyl">
+<form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <input name="newsyl" type="submit" value="Syllabus" />
 </form>
-<form action="/adm/coursedocs" method="post" name="newaboutme">
+<form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" 
@@ -438,9 +462,16 @@ value="$plainname=/adm/$udom/$uname/abou
 ENDSUPFORM
        }
     }
-
-    $r->print('</body></html>');
-    return OK;
+    if ($allowed) {
+	$r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
+    }
+  } 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",$showdoc).'</table></p>');
+  }
+  $r->print('</body></html>');
+  return OK;
 } 
 
 1;