--- loncom/interface/lonfeedback.pm	2005/04/07 07:34:52	1.158
+++ loncom/interface/lonfeedback.pm	2005/05/20 17:04:30	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.158 2005/04/07 07:34:52 albertel Exp $
+# $Id: lonfeedback.pm,v 1.163 2005/05/20 17:04:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2375,17 +2375,48 @@ sub secapply {
     return '';
 }
 
+=pod 
+
+=over 4
+
+=item *
+
+decide_receiver($feedurl,$author,$question,$course,$policy,$defaultflag);
+
+Arguments
+  $feedurl - /res/ url of resource (only need if $author is true)
+  $author,$question,$course,$policy - all true/false parameters
+    if true will attempt to find the addresses of user that should receive
+    this type of feedback (author - feedback to author of resource $feedurl,
+    $question 'Resource Content Questions', $course 'Course Content Question',
+    $policy 'Course Policy')
+    (Additionally it also checks $env for whether the corresponding form.<name>
+    element exists, for ease of use in a html response context)
+   
+  $defaultflag - (internal should be left blank) if true gather addresses 
+                 that aren't for a section even if I have a section
+                 (used for reccursion internally, first we look for
+                 addresses for our specific section then we recurse
+                 and look for non section addresses)
+
+Returns
+  $typestyle - string of html text, describing what addresses were found
+  %to - a hash, which keys are addresses of users to send messages to
+        the keys will look like   name:domain
+
+=cut
+
 sub decide_receiver {
   my ($feedurl,$author,$question,$course,$policy,$defaultflag) = @_;
   my $typestyle='';
   my %to=();
   if ($env{'form.author'}||$author) {
-    $typestyle.='Submitting as Author Feedback<br>';
+    $typestyle.='Submitting as Author Feedback<br />';
     $feedurl=~/^\/res\/(\w+)\/(\w+)\//;
     $to{$2.':'.$1}=1;
   }
   if ($env{'form.question'}||$question) {
-    $typestyle.='Submitting as Question<br>';
+    $typestyle.='Submitting as Question<br />';
     foreach (split(/\,/,
 		   $env{'course.'.$env{'request.course.id'}.'.question.email'})
 	     ) {
@@ -2866,12 +2897,7 @@ sub has_discussion {
     my @allres=$navmap->retrieveResources();
     foreach my $resource (@allres) {
         if ($resource->hasDiscussion()) {
-            my $ressymb;
-            if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
-                $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-            } else {
-                $ressymb = $resource->symb();
-            }
+            my $ressymb = $resource->wrap_symb();
             push @{$resourcesref}, $ressymb;
         }
     }
@@ -3030,14 +3056,8 @@ END
           'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
       );       
       foreach (@resources) {
-# backward compatibility (bulletin boards used to be 'wrapped')
           my $ressymb=$_;
 	  &Apache::lonenc::check_decrypt(\$ressymb);
-          if ($ressymb =~ m/bulletin___\d+___/) {
-              unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) {
-                  $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper/|;
-              }
-          }
           my $lastkey = $ressymb.'_lastread';
           $discinfo{$lastkey} = $env{'form.navtime'};
       }
@@ -3258,9 +3278,7 @@ ENDREDIR
 	  unless ($symb) { $goahead=0; }
       }
       # backward compatibility (bulletin boards used to be 'wrapped')
-      if ($feedurl=~m|^/adm/wrapper/adm/.*/bulletinboard$|) {
-	  $feedurl=~s|^/adm/wrapper||;
-      }
+      &dewrapper(\$feedurl);
       if (!$goahead) {
           # Ambiguous Problem Resource
 	  $r->internal_redirect('/adm/ambiguous');