--- loncom/interface/lonfeedback.pm	2004/08/17 14:27:19	1.116
+++ loncom/interface/lonfeedback.pm	2004/09/13 05:12:56	1.123
@@ -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.123 2004/09/13 05:12:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,13 +41,13 @@ use Apache::lonspeller();
 use Cwd;
 
 sub discussion_open {
-    my ($status)=@_;
+    my ($status,$symb)=@_;
     if (defined($status) &&
 	!($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER'
 	  || $status eq 'OPEN')) {
 	return 0;
     }
-    my $close=&Apache::lonnet::EXT('resource.0.discussend');
+    my $close=&Apache::lonnet::EXT('resource.0.discussend',$symb);
     if (defined($close) && $close ne '' && $close < time) {
 	return 0;
     }
@@ -59,7 +59,7 @@ sub discussion_visible {
     if (not &discussion_open($status)) {
 	my $hidden=&Apache::lonnet::EXT('resource.0.discusshide');
 	if (lc($hidden) eq 'yes' or $hidden eq '' or !defined($hidden))  {
-	    return 0;
+	    if (!$ENV{'request.role.adv'}) { return 0; }
 	}
     }
     return 1;
@@ -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 ++;
 
@@ -446,11 +454,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>';
 		    }
@@ -626,7 +634,8 @@ END
                 $attachnum += @currnewattach;
             }
         }
-	$discussion.=(<<ENDDISCUSS);
+	if (&discussion_open($status)) {
+	    $discussion.=(<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data">
 <input type="submit" name="discuss" value="Post Discussion" />
 <input type="submit" name="anondiscuss" value="Post Anonymous Discussion" />
@@ -665,6 +674,7 @@ ENDDISCUSS
             $discussion.=$newattachmsg;
 	    $discussion.=&generate_preview_button();
 	}
+	}
         } else {
 	if (&discussion_open($status) &&
 	    &Apache::lonnet::allowed('pch',
@@ -1355,7 +1365,7 @@ $htmlheader
         }
 
         if (rec) {
-            if (typeof(document.mailform.onsubmit)!='undefined') {
+            if (typeof(document.mailform.onsubmit)=='function') {
 		document.mailform.onsubmit();
 	    }
 	    document.mailform.submit();
@@ -1977,45 +1987,6 @@ sub get_post_attachments {
     return;
 }
 
-sub build_ims_export {
-    my ($r,$symb,$previous,$feedurl) = @_;
- # backward compatibility (bulletin boards used to be 'wrapped')
-    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
-        $feedurl=~s|^/adm/wrapper||;
-    }
-    my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
-                          $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                          $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-    my @depth=();
-    my %alldiscussion=();
-    my @discussionitems=();
-    my %usernamesort = ();
-    my %subjectsort = ();
-    my %namesort = ();
-    my %notshown = ();
-    my %newitem = ();
-    my %dischash = ();
-    my %shown = ();
-    my %roleinfo = ();
-    my @posters=();
-    my $maxdepth=0;
-    my $visible=0;
-    my $newpostsflag=0;
-    my $status;
-    my $viewgrades;
-    my $seeid;
-    my $prevread;
-    my $sortposts;
-    my $ressymb;
-    my $target;
-    my $readkey;
-    my $showunmark;
-    my $showonlyunread;
-
-}
-
-
-
 sub fail_redirect {;
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
@@ -2028,6 +1999,7 @@ sub fail_redirect {;
 <body bgcolor="#FFFFFF">
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>Sorry, no recipients  ...</b>
+<br /><a href="$feedurl">Continue</a>
 </body>
 </html>
 ENDFAILREDIR
@@ -2098,6 +2070,7 @@ $roletag
 $sectag
 $userpicktag
 </form>
+<br /><a href="$feedurl">Continue</a>
 </body>
 </html>
 ENDREDIR
@@ -2106,6 +2079,7 @@ ENDREDIR
 sub no_redirect_back {
   my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
+  my $continue=&mt('Continue');
   $r->print (<<ENDNOREDIR);
 <html>
 <head><title>Feedback not sent</title>
@@ -2121,6 +2095,7 @@ ENDNOREDIR
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
 <b>$nofeed</b>
+<br /><a href="$feedurl">$continue</a>
 </body>
 </html>
 ENDNOREDIRTWO
@@ -2330,7 +2305,13 @@ sub send_msg {
 sub adddiscuss {
     my ($symb,$email,$anon,$attachmenturl,$subject)=@_;
     my $status='';
-    if (&discussion_open() &&
+    my $realsymb;
+    if ($symb=~/^bulletin___/) {
+	my $filename=(&Apache::lonnet::decode_symb($symb))[2];
+	$filename=~s|^adm/wrapper/||;
+	$realsymb=&Apache::lonnet::symbread($filename);
+    }
+    if (&discussion_open(undef,$realsymb) &&
 	&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}.
         ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 
@@ -2453,7 +2434,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
 }
@@ -2596,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="this.form.subject.value=document.mailform.subject.value;this.form.comment.value=document.mailform.comment.value;
+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;
 END
     unless ($mode eq 'board') {
         $response .= 'javascript:anonchk();';
@@ -2938,6 +2919,7 @@ END
 <b>$lt{'mnpa'} $numitems $lt{'robb'}</b>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>
+<br /><a href="$feedurl">Continue</a>
 </body>
 </html>
 ENDREDIR
@@ -3189,7 +3171,6 @@ ENDREDIR
           $status=$Apache::inputtags::status[-1];
       }
       my $discussion = &list_discussion($mode,$status,$symb); 
-#      &build_ims_export($r,$symb,$previous,$feedurl);
       my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion');
       $r->print($bodytag.$discussion);                                     
       return OK;