--- loncom/interface/lonfeedback.pm 2006/02/09 22:11:54 1.180 +++ loncom/interface/lonfeedback.pm 2006/03/15 22:06:08 1.185 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.180 2006/02/09 22:11:54 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.185 2006/03/15 22:06:08 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2224,7 +2224,7 @@ $html - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). @@ -2264,7 +2264,7 @@ ENDNOREDIR my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif'); $r->print (< - + $nofeed
$continue @@ -2314,8 +2314,8 @@ sub screen_header { ' ('.&mt('name only visible to course faculty').') '. ''.&mt('Change Screenname').''; } - #$discussoptions.='
'; + $discussoptions.='
'; } if ($msgoptions) { $msgoptions='

'.&mt('Sending Messages').'

'.$msgoptions; } if ($discussoptions) { @@ -2478,14 +2478,16 @@ sub feedback_available { } sub send_msg { - my ($feedurl,$email,$citations,$attachmenturl,%to)=@_; + 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 (keys %to) { if ($_) { my $declutter=&Apache::lonnet::declutter($feedurl); unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), - 'Feedback ['.$declutter.']',$email,$citations,$feedurl, + $title.' ['.$declutter.']',$email,$citations,$feedurl, $attachmenturl)=~/ok/) { $status.='
'.&mt('Error sending message to').' '.$_.'
'; } else { @@ -2539,7 +2541,6 @@ sub adddiscuss { } if (($symb) && ($email)) { if ($env{'form.editdisc'}) { - my %newcontrib = (); $contrib{'ip'}=$ENV{'REMOTE_ADDR'}; $contrib{'host'}=$Apache::lonnet::perlvar{'lonHostID'}; $contrib{'timestamp'} = time; @@ -2582,12 +2583,8 @@ sub adddiscuss { } } $contrib{'history'} .= $oldcontrib{$oldidx.':timestamp'}; - foreach (keys %contrib) { - my $key = $oldidx.':'.&Apache::lonnet::escape($oldsymb).':'.$_; - $newcontrib{$key} = $contrib{$_}; - } my $put_reply = &Apache::lonnet::putstore($env{'request.course.id'}, - \%newcontrib, + $oldsymb,$oldidx,\%contrib, $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); $status='Editing class discussion'.($anon?' (anonymous)':''); @@ -3136,7 +3133,7 @@ $html - + $textline
@@ -3424,7 +3421,7 @@ ENDREDIR my ($typestyle,%to) = &decide_receiver($feedurl); # Actually send mail - my ($status,$numsent)=&send_msg($feedurl,$email,$citations, + my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),$feedurl,$email,$citations, $attachmenturl,%to); # Discussion? Store that. @@ -3496,30 +3493,25 @@ sub editing_allowed { my $cid = $env{'request.course.id'}; my $role = (split(/\./,$env{'request.role'}))[0]; my $section = $env{'request.course.sec'}; - my $allow_editing_config = $env{'course.'.$env{'request.course.id'}. - '.allow_discussion_post_editing'}; + my $allow_editing_config = + $env{'course.'.$cid.'.allow_discussion_post_editing'}; if ($allow_editing_config =~ m/^\s*yes\s*$/i) { $can_edit = 1; } else { - my @editor_roles = split(/,/,$allow_editing_config); - if (@editor_roles > 0) { - foreach my $editor (@editor_roles) { - my ($editor_role,$editor_sec) = split(/:/,$editor); - if ($editor_role eq $role) { - if (defined($editor_sec)) { - if (defined($section)) { - if ($editor_sec eq $section) { - $can_edit = 1; - last; - } - } - } else { - $can_edit = 1; - last; - } - } - } - } + foreach my $editor (split(/,/,$allow_editing_config)) { + my ($editor_role,$editor_sec) = split(/:/,$editor); + if ($editor_role eq $role + && defined($editor_sec) + && defined($section) + && $editor_sec eq $section) { + $can_edit = 1; + last; + } + if ($editor_role eq $role + && !defined($editor_sec)) { + $can_edit = 1; + } + } } return $can_edit; }