--- loncom/interface/lonfeedback.pm 2007/02/28 16:30:40 1.244
+++ loncom/interface/lonfeedback.pm 2007/03/20 00:08:09 1.246
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.244 2007/02/28 16:30:40 www Exp $
+# $Id: lonfeedback.pm,v 1.246 2007/03/20 00:08:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1012,7 +1012,7 @@ sub build_posting_display {
$sender.=' ['.$$anonhash{$key}.'] '.
$screenname;
}
- $sender.=&Apache::loncommon::studentimagetag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'});
+ $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'}}} = ();
@@ -2675,36 +2675,44 @@ sub feedback_available {
}
sub send_msg {
- 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) {
- unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$key),
- $title.' ['.$restitle.']',$email,$citations,$feedurl,
- $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
- $status.='
'.&mt('Error sending message to').' '.$key.'
';
- } 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.='
'.&mt('Error sending message to [_1], no user specified.',$key);
+ } elsif (!defined($domain)) {
+ $status.='
'.&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.='
'.&mt('Error sending message to').' '.$key.'
';
+ } 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.='
'.&mt('Not registered').'
';
- }
+ my %newrecord=();
+ $newrecord{'resource'}=$feedurl;
+ $newrecord{'subnumber'}=$record{'subnumber'}+1;
+ unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') {
+ $status.='
'.&mt('Not registered').'
';
+ }
}
-
- return ($status,$sendsomething);
+
+ return ($status,$sendsomething);
}
sub adddiscuss {