--- loncom/interface/londocs.pm	2004/02/27 19:11:08	1.109
+++ loncom/interface/londocs.pm	2004/04/06 23:05:29	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.109 2004/02/27 19:11:08 albertel Exp $
+# $Id: londocs.pm,v 1.113 2004/04/06 23:05:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -280,7 +280,7 @@ sub editor {
 # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
-	    if ($folder=~/^$1/) {
+	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"
 	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
@@ -398,7 +398,7 @@ sub editor {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { next; }
-           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));
+           $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
         }
         $r->print('</table>');
@@ -408,7 +408,7 @@ sub editor {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx)=@_;
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
      &Apache::lonnet::unescape($title)),'"<>&\'');
@@ -433,7 +433,7 @@ sub entryline {
 	if ($ENV{'form.foldername'}) {
 	    $foldername='&foldername='.
 		&Apache::lonnet::escape($ENV{'form.foldername'});
-	    $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'});
+	    $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
 	}
 	$line.=(<<END);
 <td><table border='0' cellspacing='2' cellpadding='0'>
@@ -458,7 +458,7 @@ END
     if ($uploaded) {
        if ($extension eq 'sequence') {
 	  $icon=$iconpath.'/folder_closed.gif';
-          $url=~/\/(\w+)\.sequence/;
+          $url=~/$coursenum\/([\/\w]+)\.sequence$/;
           $url='/adm/coursedocs?folder='.$1;
           $isfolder=1;
        } else {
@@ -466,21 +466,23 @@ END
        } 
     }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
-    if (($residx) && ($folder!~/supplemental/)) {
-       $url.=(($url=~/\?/)?'&':'?').'symb='.
-       &Apache::lonnet::escape(&Apache::lonnet::symbclean(
+    if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
+	my $symb=&Apache::lonnet::symbclean(
           &Apache::lonnet::declutter('uploaded/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
            '.sequence').
            '___'.$residx.'___'.
-	   &Apache::lonnet::declutter($url)));
+	   &Apache::lonnet::declutter($url));
+	(undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+	$url=&Apache::lonnet::clutter($url);
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }
     if ($isfolder) { $url.='&foldername='.
        &Apache::lonnet::escape($foldertitle); }
-    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.
-	'"><img src="'.$icon.'" border="0"></a></td>'.
-        "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";
+    $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+	'" border="0"></a></td>'.
+        "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
     return $line;
 }
 
@@ -1013,6 +1015,14 @@ function makeabout() {
    }
 }
 
+function makeims() {
+    var caller = document.forms.ims.folder.value
+    var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"
+    newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes")
+    newWindow.location.href = newlocation
+}
+
+
 function finishpick() {
     var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;
@@ -1073,6 +1083,7 @@ ENDNEWSCRIPT
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
 		'abou' => 'About User',
+                'imsf' => 'Import IMS package',
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment' 
@@ -1110,13 +1121,15 @@ ENDCOURSEVERIFY
 		     &mt('Editing the Table of Contents for your Course')));
     }
 # --------------------------------------------------------- Standard documents
-    my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'});
+    my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
-       unless ($folder=~/^default/) { $folder='default'; }
+       if ($folder eq '') {
+           $folder='default';
+       }
        my $postexec='';
        if ($folder eq 'default') {
 	   $r->print('<script>this.window.name="loncapaclient";</script>');
@@ -1269,6 +1282,11 @@ $help{'My Personal Info'}
 onClick="javascript:makeabout();" />
 </nobr>
 </form>
+<form action="/adm/imsimportdocs" method="post" name="ims">
+<input type="hidden" name="folder" value="$folder" />
+<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+</nobr>
+</form>
 </td></tr>
 </table>
 ENDFORM