--- loncom/interface/lonfeedback.pm	2004/06/23 17:42:58	1.95
+++ loncom/interface/lonfeedback.pm	2004/07/09 23:05:52	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.95 2004/06/23 17:42:58 sakharuk Exp $
+# $Id: lonfeedback.pm,v 1.99 2004/07/09 23:05:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -325,54 +325,50 @@ sub list_discussion {
     my $color = &Apache::loncommon::designparm($function.'.tabbg',
                                                     $ENV{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
-        'cuse' => 'Current settings for this discussion',
+        'cuse' => 'Current discussion settings',
         'allposts' => 'All posts',
         'unread' => 'New posts only',
         'ondisp' => 'Once displayed',
         'onmark' => 'Once marked read',
         'disa' => 'Posts to be displayed',
         'npce' => 'Posts cease to be marked "NEW"',
-        'chgt' => 'Change to ',
+        'chgt' => 'Change',
+        'disp' => 'Display',
+        'nolo' => 'Not new',
     );
 
     my $currdisp = $lt{'allposts'};
     my $currmark = $lt{'onmark'};
     my $dispchange = $lt{'unread'};
     my $markchange = $lt{'ondisp'};
-    my $displink = '/adm/feedback?onlyunread='.$ressymb;
-    my $marklink = '/adm/feedback?markondisp='.$ressymb;
+    my $chglink = '/adm/feedback?modifydisp='.$ressymb;
+    my $displink = 'onlyunread';
+    my $marklink = 'markondisp';
 
     if ($markondisp) {
         $currmark = $lt{'ondisp'};
         $markchange = $lt{'onmark'};
-        $marklink = '/adm/feedback?markonread='.$ressymb;
-        if ($newpostsflag) {
-            $marklink .= '&previous='.$prevread;
-        }
+        $marklink = 'markonread';
     }
 
     if ($showonlyunread) {
         $currdisp = $lt{'unread'};
         $dispchange = $lt{'allposts'};
-        $displink = '/adm/feedback?allposts='.$ressymb;
+        $displink = 'allposts';
     }
+   
+    $chglink .= '&changes='.$displink.'_'.$marklink;
 
     if ($newpostsflag) {
-        $displink .= '&previous='.$prevread;
+        $chglink .= '&previous='.$prevread;
     }
 
     if ($visible) {
 # Print the discusssion
 	if ($outputtarget ne 'tex') {
+            my $colspan=$maxdepth+1;
 	    $discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
-	    my $colspan=$maxdepth+1;
-	    $discussion .= '<tr bgcolor="#FFFFFF"><td colspan="'.$colspan.'" valign="top">'.
-		'<table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">'.
-		'<tr><td align="left"><b>'.$lt{'cuse'}.'</b></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><b>'.$lt{'chgt'}.'</b></td></tr>'.
-		'<tr><td>'.$lt{'disa'}.':&nbsp;<i>'.$currdisp.'</i></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><a href="'.$displink.'">'.$dispchange.'</a></td></tr>'.
-		'<tr><td>'.$lt{'npce'}.':&nbsp;<i>'.$currmark.'</i></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td align="right"><a href="'.$marklink.'">'.$markchange.'</a></td></tr>'.
-		'</table></td></tr>'.
-		'<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
+	    $discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
 		'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
 	    if ($visible>2) {
 		$discussion.='<td align="left">'.
@@ -386,7 +382,7 @@ sub list_discussion {
 		    $discussion .= '&previous='.$prevread;
 		}
 		$discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;</td>';
-	    } 
+	    }
 	    if ($newpostsflag) {
 		if (!$markondisp) {
 		    $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a>&nbsp;&nbsp;';
@@ -445,12 +441,51 @@ sub list_discussion {
 		    $discussionitems[$alldiscussion{$_}]=~s/<\/td><td([^>]*)>/$threadinsert<\/td><td TeXwidth="65 mm" align="left">/;
 		    $discussionitems[$alldiscussion{$_}]=~s/<a([^>]+)>(Hide|Delete|Reply|Submissions)<\/a>//g;
                     $discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
-		    $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]);
+		    
+                    #FIXME xmlparse can't be safely called from inside xmlparse
+                    #   due to the global variables that are use, the safe
+                    #   space etc. I expect this has unforseen issues that
+                    #   need resolving.
+		    
+                    $discussion.=&Apache::lonxml::xmlparse('','tex',$discussionitems[$alldiscussion{$_}]);
 		}
 	    }
         }
 	if ($outputtarget ne 'tex') {
-	    $discussion.='</table><br /><br />';
+            my $colspan=$maxdepth+1;
+            $discussion .= <<END; 
+            <tr bgcolor="#FFFFFF">
+             <td colspan="$colspan" valign="top">
+              <table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">
+               <tr>
+                <td align="left">
+                 <table border="0" cellpadding="0" cellspacing="4">
+                  <tr>
+                   <td>
+                    <font size="-1"><b>$lt{'cuse'}</b>:</td>
+                   <td>&nbsp;</td>
+END
+            if ($newpostsflag) {
+                $discussion .= 
+                   '<td><font size="-1">1.&nbsp;'.$lt{'disp'}.'&nbsp;-&nbsp;<i>'.$currdisp.'</i>&nbsp;&nbsp;2.&nbsp;'.$lt{'nolo'}.'&nbsp;-&nbsp;<i>'.$currmark.'</i></font></td>';
+            } else {
+                $discussion .=
+                   '<td><font size="-1">'.$lt{'disp'}.'&nbsp;-&nbsp;<i>'.$currdisp.'</i></font></td>';
+            }
+            $discussion .= <<END;
+                   <td>&nbsp;</td>
+                   <td>
+                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</font></b></td>
+                  </tr>
+                 </table>
+                </td>
+               </tr>
+              </table>
+             </td>
+            </tr>
+           </table>
+           <br /><br />
+END
 	}
     }
     if ($discussiononly) {
@@ -605,6 +640,136 @@ $r->print(&generate_preview_button().
 '</body></html>');
 }
 
+sub print_display_options {
+    my ($r,$symb,$previous,$dispchg,$markchg,$feedurl) = @_;
+ # backward compatibility (bulletin boards used to be 'wrapped')
+    if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+        $feedurl=~s|^/adm/wrapper||;
+    }
+
+    my $function = &Apache::loncommon::get_users_function();
+    my $tabcolor = &Apache::loncommon::designparm($function.'.tabbg',
+                                                    $ENV{'user.domain'});
+    my $bodytag=&Apache::loncommon::bodytag('Discussion options',
+                                          '','');
+
+    my %lt = &Apache::lonlocal::texthash(
+        'dido' => 'Discussion display options',
+        'pref' => 'Display Preference',
+        'curr' => 'Current setting ',
+        'actn' => 'Action',
+        'deff' => 'Default for all discussions',
+        'prca' => 'Preferences can be set for this discussion that determine ....',
+        'whpo' => 'Which posts are displayed when you display this bulletin board or resource, and',
+        'unwh' => 'Under what circumstances posts are identfied as "New."',
+        'allposts' => 'All posts',
+        'unread' => 'New posts only',
+        'ondisp' => 'Once displayed',
+        'onmark' => 'Once marked as read',
+        'disa' => 'Posts displayed?',
+        'npmr' => 'New posts cease to be identified as "New"?',
+        'chgt' => 'Change to ',
+        'mkdf' => 'Set to ',
+        'yhni' => 'You have not indicated that you wish to change either of the discussion settings',
+        'ywbr' => 'You will be returned to the previous page if you click OK.'
+    );
+
+    my $dispchange = $lt{'unread'};
+    my $markchange = $lt{'ondisp'};
+    my $currdisp = $lt{'allposts'};
+    my $currmark = $lt{'onmark'};
+    my $discdisp = 'allposts';
+    my $discmark = 'onmark';
+                                                                                      
+    if ($dispchg eq 'allposts') {
+        $dispchange = $lt{'allposts'};
+        $currdisp = $lt{'unread'};
+        $discdisp = 'unread';
+    }
+                                                                                      
+    if ($markchg eq 'markonread') {
+        $markchange = $lt{'onmark'};
+        $currmark = $lt{'ondisp'};
+        $discmark = 'ondisp';
+    }
+    $r->print(<<END);
+<html>
+<head>
+<title>$lt{'dido'}</title>
+<meta http-equiv="pragma" content="no-cache" />
+<script>
+function setDisp() {
+    var prev = "$previous"
+    var chktotal = 0
+    if (document.modifydisp.discdisp.checked == true) {
+        document.modifydisp.$dispchg.value = "$symb"
+        chktotal ++
+    }
+    if (document.modifydisp.discmark.checked == true) {
+        document.modifydisp.$markchg.value = "$symb"
+        chktotal ++
+    }
+    if (chktotal > 0) { 
+        document.modifydisp.submit()
+    } else {
+        if(confirm("$lt{'yhni'}. \\n$lt{'ywbr'}"))      {
+            if (prev > 0) {
+                location.href = "$feedurl?previous=$previous"
+            } else {
+                location.href = "$feedurl"
+            }
+        }
+    }
+}
+</script>
+</head>
+$bodytag
+<form name="modifydisp" method="post" action="/adm/feedback">
+$lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol>
+<br />
+<table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+  <td width="100%" bgcolor="#000000">
+   <table width="100%" border="0" cellpadding="1" cellspacing="0">
+    <tr>
+     <td width="100%" bgcolor="#000000">
+      <table border="0" cellpadding="3" cellspacing="1" bgcolor="#FFFFFF">
+       <tr bgcolor="$tabcolor">
+        <td><b>$lt{'pref'}</b></td>
+        <td><b>$lt{'curr'}</b></td>
+        <td><b>$lt{'actn'}?</b></td>
+       </tr>
+       <tr bgcolor="#dddddd">
+       <td>$lt{'disa'}</td>
+       <td>$lt{$discdisp}</td>
+       <td><input type="checkbox" name="discdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
+      </tr><tr bgcolor="#eeeeee">
+       <td>$lt{'npmr'}</td>
+       <td>$lt{$discmark}</td>
+       <td><input type="checkbox" name="discmark" />$lt{'chgt'} "$markchange"</td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+  </table>
+ </td>
+</tr>
+</table>
+<br />
+<br />
+<input type="hidden" name="previous" value="$previous" />
+<input type="hidden" name="$dispchg" value=""/>
+<input type="hidden" name="$markchg" value=""/>
+<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<br />
+<br />
+</form>
+</body>
+</html>
+END
+    return;
+}
+
 sub fail_redirect {
   my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
@@ -626,6 +791,11 @@ sub redirect_back {
   my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous) = @_;
   my $prevtag = '';
   my $qrystr = '';
+ # backward compatibility (bulletin boards used to be 'wrapped')
+  if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+      $feedurl=~s|^/adm/wrapper||;
+  }
+
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   if ($previous > 0) {
       $qrystr = 'previous='.$previous;
@@ -965,58 +1135,117 @@ sub handler {
 
 # --------------------------- Get query string for limited number of parameters
 
-   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp']);
-
-  if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
-# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
-
-      &Apache::loncommon::content_type($r,'text/html');
-      $r->send_http_header;
-      my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
-      my $ressymb = $symb;
-      my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-          $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
-      }
-                                                                                          
+  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+         ['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp','modifydisp','changes','navmaps','navurl']);
+  if ($ENV{'form.navmaps'}) {
       my %discinfo = ();
-      my $lastkey = $ressymb.'_lastread';
-      my $ondispkey = $ressymb.'_markondisp';
-      if ($ENV{'form.markondisp'}) {
-          $discinfo{$lastkey} = time;
-          $discinfo{$ondispkey} = 1;
-      } elsif ($ENV{'form.markonread'}) {
-          if ( defined($ENV{'previous'}) ) {
-              $discinfo{$lastkey} = $ENV{'previous'};
+      my @resources = ();
+      if ($ENV{'form.navmaps'} =~ /:/) {
+          @resources = split/:/,$ENV{'form.navmaps'};
+      } else {
+          @resources = ("$ENV{'form.navmaps'}");
+      }
+      my $numitems = @resources;
+      my $feedurl = '/adm/navmaps';
+      if ($ENV{'form.navurl'}) {
+          $feedurl .= '?'.$ENV{'form.navurl'};
+      }
+      my %lt = &Apache::lonlocal::texthash(
+          'mnpa' => 'Marked "New" posts as read in a total of',
+          'robb' => 'resources/bulletin boards.'
+      );       
+      foreach (@resources) {
+# backward compatibility (bulletin boards used to be 'wrapped')
+          my $ressymb=$_;
+          if ($ressymb =~ m/bulletin___\d+___/) {
+              unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+                  $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper/|;
+              }
           }
-          $discinfo{$ondispkey} = 0;
+          my $lastkey = $ressymb.'_lastread';
+          $discinfo{$lastkey} = time;
       }
       &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-      if ($ENV{'form.markondisp'}) {
-          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
-      } else {
-          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
-      }
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      $r->print (<<ENDREDIR);
+<html>
+<head>
+<title>New posts marked as read</title>
+<meta http-equiv="pragma" content="no-cache" />
+<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$feedurl" />
+</head>
+<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
+<img align="right" src="/adm/lonIcons/lonlogos.gif" />
+<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>
+<form name="reldt" action="$feedurl" target="loncapaclient">
+</form>
+</body>
+</html>
+ENDREDIR
       return OK;
-  } elsif (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
-# ----------------------------------------------------------------- Modify display setting for this discussion 
+  } elsif ($ENV{'form.modifydisp'}) {
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
-      my $ressymb = $symb;
+      my $symb=$ENV{'form.modifydisp'};
       my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
-      unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-          $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+      my $previous=$ENV{'form.previous'};
+      my ($dispchg,$markchg) = split/_/,$ENV{'form.changes'};
+      my $feedurl = &Apache::lonnet::clutter($url);
+ # backward compatibility (bulletin boards used to be 'wrapped')  
+      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
+          $feedurl=~s|^/adm/wrapper||;
       }
-      my %discinfo = ();
-      if ($ENV{'form.allposts'}) {
-          $discinfo{$ressymb.'_showonlyunread'} = 0;
-      } elsif ($ENV{'form.onlyunread'}) {
-          $discinfo{$ressymb.'_showonlyunread'} = 1;
+      &print_display_options($r,$symb,$previous,$dispchg,$markchg,$feedurl);
+      return OK;
+  } elsif (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my $previous=$ENV{'form.previous'};
+      my ($map,$ind,$url);
+      if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {
+# ---------------------- Modify setting for identification of 'NEW' posts in this discussion
+          my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};
+          my $ressymb = $symb;
+          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+          unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+              $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+          }
+          my %discinfo = ();
+          my $lastkey = $ressymb.'_lastread';
+          my $ondispkey = $ressymb.'_markondisp';
+          if ($ENV{'form.markondisp'}) {
+              $discinfo{$lastkey} = time;
+              $discinfo{$ondispkey} = 1;
+          } elsif ($ENV{'form.markonread'}) {
+              if ( $previous > 0 ) {
+                  $discinfo{$lastkey} = $previous;
+              }
+              $discinfo{$ondispkey} = 0;
+          }
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      }
+      if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) {
+# ----------------------------------------------------------------- Modify display setting for this discussion 
+          my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'};
+          my $ressymb = $symb;
+          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+          unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
+              $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
+          }
+          my %discinfo = ();
+          if ($ENV{'form.allposts'}) {
+              $discinfo{$ressymb.'_showonlyunread'} = 0;
+          } elsif ($ENV{'form.onlyunread'}) {
+              $discinfo{$ressymb.'_showonlyunread'} = 1;
+          }
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      }
+      if (($ENV{'form.markonread'}) || ($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'}) ) {
+          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$previous);
+      } else {
+          &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0');
       }
-      &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
-      &redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'});
       return OK;
   } elsif ($ENV{'form.markread'}) {
 # ----------------------------------------------------------------- Mark new posts as read
@@ -1137,7 +1366,7 @@ sub handler {
   if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form)$/) {
       unless ($symb) { $goahead=0; }
   }
-  # backward compatibility (bulltin boards used to be 'wrapped')
+  # backward compatibility (bulletin boards used to be 'wrapped')
   if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
       $feedurl=~s|^/adm/wrapper||;
   }