--- loncom/interface/lonfeedback.pm	2006/12/11 04:10:35	1.235
+++ loncom/interface/lonfeedback.pm	2007/08/10 00:02:08	1.250
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.235 2006/12/11 04:10:35 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.250 2007/08/10 00:02:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,7 +91,7 @@ sub list_discussion {
     if (not &discussion_visible($status)) {
         if ($mode ne 'board') {
             &Apache::lonenc::check_encrypt(\$ressymb); 
-            return &send_message_link($ressymb);
+            return '<br />'.&send_message_link($ressymb);
         }
     }
     if ($group ne '' && $mode eq 'board') {
@@ -637,7 +637,7 @@ END
                 }
             }
             if ($dischash{$toggkey}) {
-                my $storebutton = &mt('Store read/unread changes');
+                my $storebutton = &mt('Save read/unread changes');
                 $discussion.='<td align="right">'.
               '<input type="hidden" name="discsymb" value="'.$ressymb.'">'."\n".
               '<input type="button" name="readoptions" value="'.$storebutton.'"'.
@@ -901,6 +901,9 @@ sub build_posting_display {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
 
+    my $see_anonymous = 
+	&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
+
     if ((@{$grouppick} == 0) || (grep(/^all$/,@{$grouppick}))) {
         $skip_group_check = 1;
     }
@@ -1001,7 +1004,7 @@ sub build_posting_display {
                                @{$$subjectsort{$subject}} = ("$idx");
                             }
                         }
-		        if ((!$contrib{$idx.':anonymous'}) || (&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
+		        if (!$contrib{$idx.':anonymous'} || $see_anonymous) {
 			    $sender=&Apache::loncommon::aboutmewrapper(
 					 $plainname,
 					 $contrib{$idx.':sendername'},
@@ -1012,7 +1015,9 @@ sub build_posting_display {
 			        $sender.=' <font color="red"><b>['.$$anonhash{$key}.']</b></font> '.
 				    $screenname;
 			    }
-
+			    if ($see_anonymous) {
+				$sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+			    }
 # Set up for sorting by domain, then username
                             unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) {
                                 %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = ();
@@ -1468,7 +1473,7 @@ sub replicate_attachments {
 }
 
 sub mail_screen {
-  my ($r,$feedurl,$options) = @_;
+  my ($r,$feedurl,$options,$caller_symb) = @_;
   if (exists($env{'form.origpage'})) {
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog','group','ref']);
   }
@@ -1479,9 +1484,8 @@ sub mail_screen {
             'title' => 'Title',
             'reta' => 'Retained attachments',
             'atta' => 'Attachment (128 KB max size)',
-           ); 
-  my $title=&Apache::lonnet::gettitle($feedurl);
-  if (!$title) { $title = $feedurl; }
+           );
+  my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
   my $subject = '';
   my $comment = '';
@@ -1669,7 +1673,7 @@ END
 
   $r->print(<<END);
 $start_page
-<h2><tt>$title</tt></h2>
+<h2><tt>$restitle</tt></h2>
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
 $prevtag
@@ -1968,7 +1972,7 @@ END
 <input type="hidden" name="$dispchgB" value=""/>
 <input type="hidden" name="$markchg" value=""/>
 <input type="hidden" name="$toggchg" value="" />
-<input type="button" name="sub" value="Store Changes" onClick="javascript:setDisp()" />
+<input type="button" name="sub" value="Save Changes" onClick="javascript:setDisp()" />
 END
     if (exists($env{'form.group'})) {
         $r->print('<input type="hidden" name="group" value="'.$env{'form.group'}.'" />');
@@ -2056,7 +2060,7 @@ sub print_sortfilter_options {
         'spgr' => 'Specific groups',
         'psub' => 'Pick specific users (by name)',
         'shal' => 'Show a list of current posters',
-        'stor' => 'Store changes',
+        'stor' => 'Save changes',
     );
 
     my %sort_types = ();
@@ -2560,26 +2564,31 @@ sub screen_header {
 		'<p><label><input type="radio" name="discuss" value="author" /> '.
 		&mt('Feedback to resource author').'</label></p>';
 	}
+        my %optionhash=();
+        foreach my $type ('question','comment','policy') {
+	    $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
+	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="question" /> '.
-		&mt('Question about resource content').'</label></p>';
+		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label></p>';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="course" /> '.
-		&mt('Question/Comment/Feedback about course content').
+		($optionhash{'comment'}?$optionhash{'comment'}:&mt('Question/Comment/Feedback about course content')).
 		'</label></p>';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
 		'<p><label><input type="radio" name="discuss" value="policy" /> '.
-		&mt('Question/Comment/Feedback about course policy').
+		($optionhash{'policy'}?$optionhash{'policy'}:&mt('Question/Comment/Feedback about course policy')).
 		'</label></p>';
 	}
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
-	if (&discussion_open(undef,$symb) &&
+        my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
+        if (!$blocked && &discussion_open(undef,$symb) && 
 	    &Apache::lonnet::allowed('pch',
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
@@ -2589,10 +2598,10 @@ sub screen_header {
 		&mt('Anonymous contribution to course discussion of resource').
 		' <i>('.&mt('name only visible to course faculty').')</i></label> '.
 		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
-        }
-        my $blockblog = &Apache::loncommon::blocking_status('blogs');
-        if (!$blockblog) {
-            $discussoptions.= &add_blog_checkbox();
+            my $blockblog = &Apache::loncommon::blocking_status('blogs');
+            if (!$blockblog) {
+                $discussoptions.= &add_blog_checkbox();
+            }
         }
     }
     if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
@@ -2641,7 +2650,7 @@ sub clear_out_html {
 }
 
 sub assemble_email {
-  my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_;
+  my ($message,$prevattempts,$usersaw,$useranswer)=@_;
   my %lt = &Apache::lonlocal::texthash(
              'prev' => 'Previous attempts of student (if applicable)',
              'orig' => 'Original screen output (if applicable)',
@@ -2662,136 +2671,53 @@ ENDCITE
   return ($email,$citations);
 }
 
-sub secapply {
-    my $rec=shift;
-    my $defaultflag=shift;
-    $rec=~s/\s+//g;
-    $rec=~s/\@/\:/g;
-    my ($adr,$sections)=($rec=~/^([^\(]+)\(([^\)]+)\)/);
-    if ($sections) {
-	foreach my $sec (split(/\;/,$sections)) {
-            if (($sec eq $env{'request.course.sec'}) ||
-                ($defaultflag && ($sec eq '*'))) {
-                return $adr; 
-            }
-        }
-    } else {
-       return $rec;
-    }
-    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.discuss'} eq 'author' ||$author) {
-    $typestyle.='Submitting as Author Feedback<br />';
-    $feedurl=~ m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/};
-    $to{$2.':'.$1}=1;
-  }
-  if ($env{'form.discuss'} eq 'question' ||$question) {
-    $typestyle.=&mt('Submitting as Question').'<br />';
-    foreach my $item (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.question.email'})
-	     ) {
-	my $rec=&secapply($item,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ($env{'form.discuss'} eq 'course' ||$course) {
-    $typestyle.=&mt('Submitting as Comment').'<br />';
-    foreach my $item (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.comment.email'})
-	     ) {
-	my $rec=&secapply($item,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ($env{'form.discuss'} eq 'policy' ||$policy) {
-    $typestyle.=&mt('Submitting as Policy Feedback').'<br />';
-    foreach my $item (split(/\,/,
-		   $env{'course.'.$env{'request.course.id'}.'.policy.email'})
-	     ) {
-	my $rec=&secapply($item,$defaultflag);
-        if ($rec) { $to{$rec}=1; }
-    } 
-  }
-  if ((scalar(%to) eq '0') && (!$defaultflag)) {
-     ($typestyle,%to)=
-	 &decide_receiver($feedurl,$author,$question,$course,$policy,1);
-  }
-  return ($typestyle,%to);
-}
 
 sub feedback_available {
     my ($question,$course,$policy)=@_;
-    my ($typestyle,%to)=&decide_receiver('',0,$question,$course,$policy);
+    my ($typestyle,%to)=&Apache::lonmsg::decide_receiver('',0,$question,
+							 $course,$policy);
     return scalar(%to);
 }
 
 sub send_msg {
-  my ($title,$feedurl,$email,$citations,$attachmenturl,%to)=@_;
-  my $status='';
-  my $sendsomething=0;
-  if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
-  unless ($title=~/\w/) { $title=&mt('Feedback'); }
-  foreach my $key (keys(%to)) {
-    if ($key) {
-      my $declutter=&Apache::lonnet::declutter($feedurl);
-      unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
-               $title.' ['.$declutter.']',$email,$citations,$feedurl,
-                $attachmenturl)=~/ok/) {
-	$status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
-      } else {
-	$sendsomething++;
-      }
+    my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
+    my $status='';
+    my $sendsomething=0;
+    my $restitle = &get_resource_title($symb,$feedurl);
+    if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
+    unless ($title=~/\w/) { $title=&mt('Feedback'); }
+    foreach my $key (keys(%to)) {
+	if ($key) {
+	    my ($user,$domain) = split(/\:/,$key,2);
+	    if (!defined($user)) {
+		$status.='<br />'.&mt('Error sending message to [_1], no user specified.',$key);
+	    } elsif (!defined($domain)) {
+		$status.='<br />'.&mt('Error sending message to [_1], no domain specified.',$key);
+	    } else {
+		unless (&Apache::lonmsg::user_normal_msg($user,$domain,
+							 $title.' ['.$restitle.']',$email,$citations,$feedurl,
+							 $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
+		    $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
+		} else {
+		    $sendsomething++;
+		}
+	    }
+	}
     }
-  }
+
 
     my %record=&Apache::lonnet::restore('_feedback');
     my ($temp)=keys(%record);
     unless ($temp=~/^error\:/) {
-       my %newrecord=();
-       $newrecord{'resource'}=$feedurl;
-       $newrecord{'subnumber'}=$record{'subnumber'}+1;
-       unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
-	   $status.='<br />'.&mt('Not registered').'<br />';
-       }
+	my %newrecord=();
+	$newrecord{'resource'}=$feedurl;
+	$newrecord{'subnumber'}=$record{'subnumber'}+1;
+	unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+	    $status.='<br />'.&mt('Not registered').'<br />';
+	}
     }
-       
-  return ($status,$sendsomething);
+    
+    return ($status,$sendsomething);
 }
 
 sub adddiscuss {
@@ -3014,7 +2940,7 @@ sub modify_attachments {
                'chth' => 'Check the checkboxes for any you wish to remove.',
                'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
                'adda' => 'Add a new attachment to this post.',
-               'stch' => 'Store Changes',
+               'stch' => 'Save Changes',
              );
     my $js = <<END;
 <script type="text/javascript">
@@ -3720,12 +3646,8 @@ ENDREDIR
       my $symb;
       if ($env{'form.replydisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.replydisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.editdisc'}) {
 	  $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
-	  my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	  $feedurl=&Apache::lonnet::clutter($url);
       } elsif ($env{'form.origpage'}) {
 	  $symb=""; 
       } else {
@@ -3733,18 +3655,18 @@ ENDREDIR
       }
       unless ($symb) {
 	  $symb=$env{'form.symb'};
-	  if ($symb) {
-	      my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
-	      $feedurl=&Apache::lonnet::clutter($url);
-	  }
       }
-      &Apache::lonenc::check_decrypt(\$symb);
+      if (defined($symb)) {
+          ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);
+      } else {
+          # backward compatibility (bulletin boards used to be 'wrapped')
+          &Apache::lonenc::check_decrypt(\$feedurl);
+          &dewrapper(\$feedurl);
+      }
       my $goahead=1;
       if ($feedurl=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	  unless ($symb) { $goahead=0; }
       }
-      # backward compatibility (bulletin boards used to be 'wrapped')
-      &dewrapper(\$feedurl);
       if (!$goahead) {
           # Ambiguous Problem Resource
 	  $r->internal_redirect('/adm/ambiguous');
@@ -3782,7 +3704,7 @@ ENDREDIR
           }
 	  my $options=&screen_header($feedurl,$symb);
 	  if ($options) {
-	      &mail_screen($r,$feedurl,$options);
+	      &mail_screen($r,$feedurl,$options,$symb);
 	  } else {
 	      &fail_redirect($r,$feedurl);
 	  }
@@ -3795,13 +3717,16 @@ ENDREDIR
 				   $env{'request.course.id'});
 
 # Get output from resource
+      &Apache::lonenc::check_encrypt(\$feedurl);
       my $usersaw=&resource_output($feedurl);
 
 # Get resource answer (need to allow student to view grades for this to work)
       &Apache::lonnet::appenv(('allowed.vgr'=>'F'));
-      my $useranswer=&Apache::loncommon::get_student_answers(
-                                   $symb,$env{'user.name'},$env{'user.domain'},
-		                   $env{'request.course.id'});
+      my $usersymb = &Apache::lonenc::check_encrypt($symb);
+      my $useranswer=
+          &Apache::loncommon::get_student_answers(
+              $usersymb,$env{'user.name'},$env{'user.domain'},
+              $env{'request.course.id'});
       &Apache::lonnet::delenv('allowed.vgr');
 # Get attachments, if any, and not too large
       my $attachmenturl='';
@@ -3831,17 +3756,17 @@ ENDREDIR
       my $message=&clear_out_html($env{'form.comment'});
 
 # Assemble email
-      my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts,
+      my ($email,$citations)=&assemble_email($message,$prevattempts,
 					     $usersaw,$useranswer);
  
 # Who gets this?
-      my ($typestyle,%to) = &decide_receiver($feedurl);
+      my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
 
 # Actually send mail
       my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'},
 						      undef,1),
 				      $feedurl,$email,$citations,
-				      $attachmenturl,%to);
+				      $attachmenturl,$usersymb,%to);
 
 # Discussion? Store that.
       my $numpost=0;
@@ -3984,5 +3909,32 @@ sub group_args {
     return $extra_args;
 }
 
+sub get_resource_title {
+    my ($symb,$feedurl) = @_;
+    my ($restitle,$plainurl);
+    if (defined($symb)) {
+        my $plain_symb = &Apache::lonenc::check_decrypt($symb);
+        $restitle = &Apache::lonnet::gettitle($plain_symb);
+    }
+    if (defined($feedurl)) {
+        $plainurl = &Apache::lonenc::check_decrypt($feedurl);
+    }
+    if (!defined($restitle)) {
+        if (defined($feedurl)) {
+            $restitle = &Apache::lonnet::gettitle($plainurl);
+        }
+    }
+    if ($plainurl ne $feedurl) {
+        my ($plain_filename) = ($plainurl =~ m-/([^/]+)$-);
+        if ($plain_filename eq $restitle) {
+            $restitle = &mt('Untitled resource');
+        }
+    }
+    if ($restitle eq '') {
+        $restitle = &mt('Untitled resource');
+    }
+    return $restitle;
+}
+
 1;
 __END__