--- loncom/interface/lonfeedback.pm	2004/08/31 22:27:10	1.122
+++ loncom/interface/lonfeedback.pm	2004/09/13 12:49:42	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.122 2004/08/31 22:27:10 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.125 2004/09/13 12:49:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,22 +177,30 @@ sub list_discussion {
 
 # Override user's default if user specified display setting for this discussion
     if (defined($dischash{$ondispkey})) {
-        $markondisp = $dischash{$ondispkey};
+        unless ($dischash{$ondispkey} eq '') {
+            $markondisp = $dischash{$ondispkey};
+        }
     }
     if ($markondisp) {
         $discinfo{$lastkey} = time;
     }
 
     if (defined($dischash{$showkey})) {
-        $showonlyunread = $dischash{$showkey};
+        unless ($dischash{$showkey} eq '') {
+            $showonlyunread = $dischash{$showkey};
+        }
     }
 
     if (defined($dischash{$markkey})) {
-        $showunmark = $dischash{$markkey};
+        unless ($dischash{$markkey} eq '') {
+            $showunmark = $dischash{$markkey};
+        }
     }
 
     if (defined($dischash{$visitkey})) {
-        $visit = $dischash{$visitkey};
+        unless ($dischash{$visitkey} eq '') {
+            $visit = $dischash{$visitkey};
+        }
     }
     $visit ++;
 
@@ -324,7 +332,6 @@ sub list_discussion {
 # open manifest file
             my $manifest = '/imsmanifest.xml';
             my $manifestfilename = $tempexport.$manifest;
-            print STDERR "manifestfilename is $manifestfilename\n";
             if ($manifestfile = Apache::File->new('>'.$manifestfilename)) {
                 $manifestok=1;
                 print $manifestfile qq|
@@ -474,7 +481,6 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                     my $postfilename = $alldiscussion{$_}.'-'.$imsitems{$alldiscussion{$_}}{'timestamp'}.'.html';
                     if ($manifestok) {
                         if (($depth[$alldiscussion{$_}] <= $currdepth) && ($alldiscussion{$_} != $firstidx)) {
-                            print STDERR "depth is $depth[$alldiscussion{$_}], currdepth is $currdepth, idx is $alldiscussion{$_}, firstidx is $firstidx\n";
                             print $manifestfile '  </item>'."\n";
                         }
                         $currdepth = $depth[$alldiscussion{$_}];
@@ -600,7 +606,7 @@ END
                 undef(%oldENV);
                 $discussion .= 'Download the zip file from <a href="'.$imszipfile.'">Discussion Posting Archive</a><br />';
                 if ($copyresult) {
-                    $discussion .= 'The following errors occurred during export - '.$copyresult;
+                    $discussion .= 'The following errors occurred during export - <br />'.$copyresult;
                 }
             } else {
                 $discussion .= '<br />Unfortunately you will not be able to retrieve an archive of the discussion posts at this time, because there was a problem creating a manifest file.<br />';
@@ -618,8 +624,8 @@ END
         my $subject = '';
         if ($ENV{'form.origpage'}) {
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['addnewattach','deloldattach','delnewattach','timestamp','idx','subject','comment']);
-            $subject = &HTML::Entities::encode($ENV{'form.subject'},'<>&"');
-            $comment = &HTML::Entities::encode($ENV{'form.comment'},'<>&"');
+            $subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+            $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
             my @keepold = ();
             &process_attachments(\@currnewattach,\@currdelold,\@keepold);
             if (@currnewattach > 0) {
@@ -1151,22 +1157,23 @@ sub replicate_attachments {
                     $i ++;
                 }
                 my ($content,$rtncode);
-                print STDERR "File to replicate is $$attachrefs{$id}{'filename'} in $1,$2\n";
                 my $uploadreply = &Apache::lonnet::getuploaded('GET',$$attachrefs{$id}{'filename'},$1,$2,$content,$rtncode);
                 if ($uploadreply eq 'ok') {
-                     my $attachcopy;
-                     if ($attachcopy = Apache::File->new('>'.$destination)) {
-                         print $attachcopy $content;
-                         close($attachcopy);
-                     } else {
-                         $response .= 'Error copying a file attachment to IMS package: '.$!.'<br />'."\n";
-                     }
+                    my $attachcopy;
+                    if ($attachcopy = Apache::File->new('>'.$destination)) {
+                        print $attachcopy $content;
+                        close($attachcopy);
+                    } else {
+                        $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$!.'<br />'."\n";
+                    }
                 } else {
-                    print STDERR "return code from lonnet was $rtncode\n";
+                    &Apache::lonnet::logthis("Replication of attachment failed when building IMS export of discussion posts - domain: $1, course: $2, file: $$attachrefs{$id}{'filename'} -error: $rtncode");
+                    $response .= 'Error copying file attachment - '.$5.' to IMS package: '.$rtncode.'<br />'."\n";
                 }
             }
         }
     }
+    return $response;
 }
 
 sub mail_screen {
@@ -1308,8 +1315,8 @@ END
   }
 
   if ($ENV{'form.origpage'}) {
-      $subject = $ENV{'form.subject'};
-      $comment = $ENV{'form.comment'};
+      $subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+      $comment = &Apache::lonnet::unescape($ENV{'form.comment'});
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
   }
   my $latexHelp=&Apache::loncommon::helpLatexCheatsheet();
@@ -2433,7 +2440,8 @@ ENDPREVIEW
 
 sub modify_attachments {
     my ($r,$currnewattach,$currdelold,$symb,$idx,$attachmenturls)=@_;
-    my $subject=&clear_out_html($ENV{'form.subject'});
+    my $orig_subject = &Apache::lonnet::unescape($ENV{'form.subject'});
+    my $subject=&clear_out_html($orig_subject);
     $subject=~s/\n/\<br \/\>/g;
     $subject=&Apache::lontexconvert::msgtexconverted($subject);
     my $timestamp=$ENV{'form.timestamp'};
@@ -2462,7 +2470,7 @@ $bodytag
  <table border="2">
   <tr>
    <td>
-    <b>Subject:</b>$subject</b><br /><br />
+    <b>Subject:</b> $subject</b><br /><br />
 END
     if ($idx) {
         if ($attachmenturls) {
@@ -2569,7 +2577,7 @@ sub generate_attachments_button {
     my $response = (<<END);
 <form name="attachment" action="/adm/feedback?attach=$ressymb" method="post">
 Click to add/remove attachments:&nbsp;<input type="button" value="$att"
-onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=document.mailform.comment.value;this.form.subject.value=document.mailform.subject.value;
+onClick="if (typeof(document.mailform.onsubmit)=='function') {document.mailform.onsubmit();};this.form.comment.value=escape(document.mailform.comment.value);this.form.subject.value=escape(document.mailform.subject.value);
 END
     unless ($mode eq 'board') {
         $response .= 'javascript:anonchk();';