--- loncom/interface/lonfeedback.pm	2005/10/30 02:38:10	1.170
+++ loncom/interface/lonfeedback.pm	2005/11/09 11:41:02	1.172
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.170 2005/10/30 02:38:10 www Exp $
+# $Id: lonfeedback.pm,v 1.172 2005/11/09 11:41:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1166,11 +1166,11 @@ sub get_post_contents {
 #    $$screenname=&Apache::loncommon::screenname(
 #                                        $$contrib{$idx.':sendername'},
 #                                        $$contrib{$idx.':senderdomain'});
-#    $$plainname=&Apache::loncommon::nickname(
-#                                        $$contrib{$idx.':sendername'},
-#                                        $$contrib{$idx.':senderdomain'});
-    ($$screenname,$$plainname)=($$contrib{$idx.':screenname'},
-				$$contrib{$idx.':plainname'});
+    $$plainname=&Apache::loncommon::nickname(
+                                        $$contrib{$idx.':sendername'},
+                                        $$contrib{$idx.':senderdomain'});
+    $$screenname=$$contrib{$idx.':screenname'};
+
     my $sender=&Apache::loncommon::aboutmewrapper(
                                  $$plainname,
                                  $$contrib{$idx.':sendername'},
@@ -2641,13 +2641,16 @@ sub newline_to_br {
 }
 
 sub generate_preview_button {
+    my ($formname,$fieldname)=@_;
+    unless ($formname) { $formname='mailform'; }
+    unless ($fieldname) { $fieldname='comment'; }
     my $pre=&mt("Show Preview and Check Spelling");
     return(<<ENDPREVIEW);
 <form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
 <input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-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;this.form.submit();" />
+onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" />
 </form>
 ENDPREVIEW
 }