--- loncom/interface/lonfeedback.pm	2012/01/06 20:05:59	1.326
+++ loncom/interface/lonfeedback.pm	2012/01/07 22:03:01	1.329
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.326 2012/01/06 20:05:59 www Exp $
+# $Id: lonfeedback.pm,v 1.329 2012/01/07 22:03:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -787,10 +787,12 @@ sub send_feedback_link {
 sub send_message_link {
     my ($ressymb) = @_;
     my $output = '<span class="LC_message_link">'.
-                 '  <a href="/adm/feedback?sendmessageonly=1&amp;symb='.
-                 &escape($ressymb).'"><img alt="" class="LC_noBorder" src="'.
-                 &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
-                 '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span></a></span>';
+                 &discussion_link($ressymb,
+                    '<img alt="" class="LC_noBorder" src="'.
+                    &Apache::loncommon::lonhttpdurl('/res/adm/pages/feedback.png').
+                    '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Send Feedback').'</span>',
+                    'sendmessageonly').
+                 '</span>';
     return $output;
 }
 
@@ -827,7 +829,17 @@ sub action_links_bar {
         $discussion .= '&amp;previous='.$prevread;
     }
     $discussion .= &group_args($group);
-    $discussion .= '">'.&mt('Export').'</a></td>';
+    $discussion .= '">'.&mt('Export').'</a>';
+    if (&Apache::lonnet::allowed('rin',$env{'request.course.id'})) {
+        $discussion .= '&nbsp;&nbsp;';
+        $discussion .='<a href="/adm/feedback?undeleteall='.$escsymb;
+        if ($newpostsflag) {
+            $discussion .= '&amp;previous='.$prevread;
+        }
+        $discussion .= &group_args($group);
+        $discussion .= '">'.&mt('Undelete all deleted entries').'</a>';
+    }
+    $discussion.='</td>';
     if ($newpostsflag) {
         if (!$markondisp) {
             $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';
@@ -876,9 +888,9 @@ sub postingform_display {
 <input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
 <input type="hidden" name="timestamp" value="$now" />
-<br /><a name="newpost"></a>
+<a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
-<b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
+<b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br />
 <textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
@@ -2713,8 +2725,8 @@ sub screen_header {
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
 	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
 	    $msgoptions= 
-		'<p><label><input type="radio" name="discuss" value="author" /> '.
-		&mt('Feedback to resource author').'</label></p>';
+		'<label><input type="radio" name="discuss" value="author" /> '.
+		&mt('Feedback to resource author').'</label><br />';
 	}
         my %optionhash=();
         foreach my $type ('question','comment','policy') {
@@ -2722,20 +2734,20 @@ sub screen_header {
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="question" /> '.
-		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label></p>';
+		'<label><input type="radio" name="discuss" value="question" /> '.
+		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="course" /> '.
+		'<label><input type="radio" name="discuss" value="course" /> '.
 		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
-		'</label></p>';
+		'</label><br />';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="policy" /> '.
+		'<label><input type="radio" name="discuss" value="policy" /> '.
 		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
-		'</label></p>';
+		'</label><br />';
 	}
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
@@ -3642,7 +3654,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['like','unlike','modal','hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
+         ['like','unlike','modal','hide','unhide','deldisc','undeleteall','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']);
   my $group = $env{'form.group'};
   my %attachmax = (
                     text => &mt('(128 KB max size)'),
@@ -4075,6 +4087,24 @@ ENDREDIR
 	  &Apache::loncommon::end_page();
       $r->print($start_page.$discussion.$end_page);
       return OK;
+
+  } elsif ($env{'form.undeleteall'}) {
+      &Apache::loncommon::content_type($r,'text/html');
+      $r->send_http_header;
+      my ($symb,$feedurl) = &get_feedurl_and_clean_symb($env{'form.undeleteall'});
+      $r->print(&Apache::loncommon::start_page('Undelete all deleted discussion entries'));
+      if (&Apache::lonnet::allowed('rin',$env{'request.course.id'})) {
+           if (&Apache::lonnet::store({'deleted' => ''},$symb,$env{'request.course.id'},
+                     $env{'course.'.$env{'request.course.id'}.'.domain'},
+                     $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+               $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Undeleted all entries")));
+           } else {
+               $r->print(&Apache::lonhtmlcommon::confirm_success(&mt("Failed to undelete entries"),1));
+           }
+           $r->print("<br /><a href='$feedurl'>".&mt("Return and reload")."</a>");
+      }
+      $r->print(&Apache::loncommon::end_page());
+      return OK;
   } else {
 # ------------------------------------------------------------- Normal feedback
       my $feedurl=$env{'form.postdata'};
@@ -4090,6 +4120,8 @@ ENDREDIR
 	  $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
       } elsif ($env{'form.origpage'}) {
 	  $symb=""; 
+      } elsif ($env{'form.sendmessageonly'}) {
+          $symb=(split(/\:\:\:/,$env{'form.sendmessageonly'}))[0];
       } else {
 	  $symb=&Apache::lonnet::symbread($feedurl);
       }