--- loncom/interface/lonfeedback.pm	2004/08/17 14:27:19	1.116
+++ loncom/interface/lonfeedback.pm	2004/08/31 15:55:16	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.116 2004/08/17 14:27:19 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.119 2004/08/31 15:55:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -446,11 +446,11 @@ imscp_v1p1.xsd http://www.imsglobal.org/
                 $alldiscussion{$_} = $_;
             }
             unless ( ($notshown{$alldiscussion{$_}} eq '1') || ($shown{$alldiscussion{$_}} == 0) ) {
-                unless ($outputtarget eq 'tex' && $outputtarget eq 'export') {
+                if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
 		    $discussion.="\n<tr>";
 		}
 	        my $thisdepth=$depth[$alldiscussion{$_}];
-                unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
+                if ($outputtarget ne 'tex' && $outputtarget ne 'export') {
 		    for (1..$thisdepth) {
 			$discussion.='<td>&nbsp;&nbsp;&nbsp;</td>';
 		    }
@@ -1355,7 +1355,7 @@ $htmlheader
         }
 
         if (rec) {
-            if (typeof(document.mailform.onsubmit)!='undefined') {
+            if (typeof(document.mailform.onsubmit)=='function') {
 		document.mailform.onsubmit();
 	    }
 	    document.mailform.submit();
@@ -2453,7 +2453,7 @@ sub generate_preview_button {
 <input type="hidden" name="subject">
 <input type="hidden" name="comment" />
 <input type="button" value="$pre"
-onClick="if (typeof(document.mailform.onsubmit)!='undefined') {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.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();" />
 </form>
 ENDPREVIEW
 }