--- loncom/interface/lonfeedback.pm 2010/02/14 17:20:19 1.273.4.8 +++ loncom/interface/lonfeedback.pm 2009/07/09 12:53:28 1.275 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.273.4.8 2010/02/14 17:20:19 raeburn Exp $ +# $Id: lonfeedback.pm,v 1.275 2009/07/09 12:53:28 kalberla 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 '
'.&send_message_link($ressymb)."
"; } } if ($group ne '' && $mode eq 'board') { @@ -103,9 +103,12 @@ sub list_discussion { my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards'); if ($blocked) { + $blocktext = '
'.$blocktext.""; &Apache::lonenc::check_encrypt(\$ressymb); if ($mode ne 'board') { - $blocktext.='
'.&send_message_link($ressymb); + $blocktext.=&send_message_link($ressymb).'
'; + }else{ + $blocktext.=""; } return $blocktext; } @@ -169,8 +172,6 @@ sub list_discussion { my $cdom = $env{'course.'.$cid.'.domain'}; my $cnum = $env{'course.'.$cid.'.num'}; - my $crstype = &Apache::loncommon::course_type(); - # Get information about students and non-students in course for filtering display of posts my %roleshash = (); @@ -354,10 +355,10 @@ sub list_discussion { $togglink = 'toggoff'; } - $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink; + $chglink .= '&changes='.$displinkA.'_'.$displinkB.'_'.$marklink.'_'.$togglink; if ($newpostsflag) { - $chglink .= '&previous='.$prevread; + $chglink .= '&previous='.$prevread; } $chglink.=&group_args($group); @@ -400,8 +401,8 @@ sub list_discussion { my $manifestfilename = $tempexport.$manifest; if ($manifestfile = Apache::File->new('>'.$manifestfilename)) { $manifestok=1; - print $manifestfile qq| - + print $manifestfile qq| + '. ''.&mt('Show all posts').' '.&mt('to display').' '. @@ -528,11 +529,11 @@ imscp_v1p1.xsd http://www.imsglobal.org/ print $manifestfile "\n". ''. - ''.$imsitems{$alldiscussion{$post}}{'title'}.''; + ''.$imsitems{$alldiscussion{$post}}{'title'}.''; $imsresources .= "\n". ''."\n". ''."\n". - $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}.''."\n". + $imsfiles{$alldiscussion{$post}}{$imsitems{$alldiscussion{$post}}{'currversion'}}."\n". ''; } my $postingfile; @@ -567,7 +568,7 @@ imscp_v1p1.xsd http://www.imsglobal.org/ + $lt{'cuse'}:
- $lt{'cuse'}:  END @@ -589,7 +590,7 @@ END   - $lt{'chgt'}? + $lt{'chgt'}?
@@ -599,7 +600,7 @@ END my %sort_types = (); my %role_types = (); my %status_types = (); - &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype); + &sort_filter_names(\%sort_types,\%role_types,\%status_types); $discussion .= ''.&mt('Sorted by').': '.$sort_types{$sortposts}.'
'; if (defined($env{'form.totposters'})) { @@ -725,13 +726,13 @@ END &postingform_display($mode,$ressymb,$now,$subject, $comment,$outputtarget,$attachnum, $currnewattach,$currdelold, - $group,$crstype); + $group); } } else { $discussion.= &postingform_display($mode,$ressymb,$now,$subject, $comment,$outputtarget,$attachnum, - $currnewattach,$currdelold,'',$crstype); + $currnewattach,$currdelold); } } } else { @@ -757,9 +758,9 @@ sub send_feedback_link { my $output = ''. ' '. - ''.&mt('Post Discussion').''; + '" border="0" />'.&mt('Post Discussion').''; return $output; } @@ -767,22 +768,22 @@ sub send_message_link { my ($ressymb) = @_; my $output = ''. ' '.&mt('Send Feedback').''; + '" border="0" />'.&mt('Send Feedback').''; return $output; } sub action_links_bar { my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_; my $discussion = ''. - ''. - ' - END $r->print(&Apache::loncommon::end_data_table_row()); @@ -1969,7 +1964,7 @@ END $r->print(<$lt{'dotm'} - + END my $save = &mt('Save'); $r->print(&Apache::loncommon::end_data_table_row()); @@ -1983,7 +1978,7 @@ END - + END if (exists($env{'form.group'})) { $r->print(''); @@ -2014,13 +2009,6 @@ sub print_sortfilter_options { my $group_sel = ''; my $numgroupvis = 5; my %sectioncount = &Apache::loncommon::get_sections(); - my @courseroles = qw(st ad ep ta in); - my $crstype = &Apache::loncommon::course_type(); - my $ccrole = 'cc'; - if ($crstype eq 'Community') { - $ccrole = 'co'; - } - push(@courseroles,$ccrole); if ($env{'request.course.sec'} !~ /^\s*$/) { #Restrict section choice to current section @sections = ('all',$env{'request.course.sec'}); @@ -2084,7 +2072,7 @@ sub print_sortfilter_options { my %sort_types = (); my %role_types = (); my %status_types = (); - &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype); + &sort_filter_names(\%sort_types,\%role_types,\%status_types); my $js = < @@ -2136,17 +2124,17 @@ $start_page

'; + ''; my $escsymb=&escape($ressymb); if ($visible>2) { - $discussion .= ''. + ''.&mt('Threaded View').'  '. @@ -798,6 +799,8 @@ sub action_links_bar { } $discussion .= &group_args($group); $discussion .='">'.&mt('Sorting/Filtering options').''.(' ' x2); + } else { + $discussion .= ''; + $discussion .= '">'.&mt('Mark NEW posts no longer new').''; } else { $discussion .= ''; } @@ -826,7 +829,7 @@ sub action_links_bar { sub postingform_display { my ($mode,$ressymb,$now,$subject,$comment,$outputtarget,$attachnum, - $currnewattach,$currdelold,$group,$crstype) = @_; + $currnewattach,$currdelold,$group) = @_; my $newattachmsg; my %lt = &Apache::lonlocal::texthash( 'note' => 'Note: in anonymous discussion, your name is visible only to course faculty', @@ -835,9 +838,6 @@ sub postingform_display { 'poan' => 'Post Anonymous Discussion', 'newa' => 'New attachments', ); - if ($crstype eq 'Community') { - $lt{'note'} = &mt('Note: in anonymous discussion, your name is visible only to community facilitators'); - } my $postingform = (< @@ -846,7 +846,7 @@ sub postingform_display {
$lt{'note'}
$lt{'title'}: 

- + ENDDISCUSS if ($env{'form.origpage'}) { $postingform .= '\n"; if ($outputtarget ne 'tex') { @@ -1014,7 +1014,6 @@ sub build_posting_display { $contrib{$idx.':senderdomain'}).' ('. $contrib{$idx.':sendername'}.':'. $contrib{$idx.':senderdomain'}.')'; - $sender = ''.$sender.''; if ($contrib{$idx.':anonymous'}) { $sender.=' ['.$$anonhash{$key}.'] '. $screenname; @@ -1022,7 +1021,6 @@ sub build_posting_display { if ($see_anonymous) { $sender.=&Apache::loncommon::student_image_tag($contrib{$idx.':senderdomain'},$contrib{$idx.':sendername'}); } - $sender = ''.$sender.''; # Set up for sorting by domain, then username unless (defined($$usernamesort{$contrib{$idx.':senderdomain'}})) { %{$$usernamesort{$contrib{$idx.':senderdomain'}}} = (); @@ -1057,7 +1055,7 @@ sub build_posting_display { $sender.=' '.&mt('Edit').''; @@ -1083,7 +1081,7 @@ sub build_posting_display { $sender.=' '.&mt('Hide').''; @@ -1124,7 +1122,7 @@ sub build_posting_display { $sender.=' '.&mt('Reply').''; @@ -1172,7 +1170,7 @@ sub build_posting_display { $$imsitems{$idx}{'attach'}=$attachtxt{$numoldver}; $$imsitems{$idx}{'timestamp'}=$contrib{$idx.':timestamp'}; $$imsitems{$idx}{'sender'}=$plainname.' ('. - $contrib{$idx.':sendername'}.':'. + $contrib{$idx.':sendername'}.' at '. $contrib{$idx.':senderdomain'}.')'; $$imsitems{$idx}{'isanonymous'}='false'; if ($contrib{$idx.':anonymous'}) { @@ -1245,24 +1243,24 @@ sub build_posting_display { if ($prevread > 0 && $prevread <= $posttime) { $$newitem{$idx} = 1; $$discussionitems[$idx] .= ' -

'.&mt('Mark NEW posts no longer new').'		 
+

'; } else { $$newitem{$idx} = 0; $$discussionitems[$idx] .= ' -
'.&mt('NEW').'
+

'; } $$discussionitems[$idx] .= ''; if ($$dischash{$toggkey}) { $$discussionitems[$idx].=''; } $$discussionitems[$idx].= '
   '. ''.$subject.'  '. - $sender.' '.$vgrlink.' ('. + $sender.' '.$vgrlink.' ('. &Apache::lonlocal::locallocaltime($posttime).')  '. $ctlink.'
'. - $message.'
'; + $message.'

'; if ($contrib{$idx.':history'}) { my @postversions = (); $$discussionitems[$idx] .= &mt('This post has been edited by the author.'); @@ -1369,7 +1367,7 @@ sub get_post_contents { $$plainname, $$contrib{$idx.':sendername'}, $$contrib{$idx.':senderdomain'}).' ('. - $$contrib{$idx.':sendername'}.':'. + $$contrib{$idx.':sendername'}.' at '. $$contrib{$idx.':senderdomain'}.')'; my $attachmenturls = $$contrib{$idx.':attachmenturl'}; my @postversions = (); @@ -1397,9 +1395,7 @@ sub get_post_contents { my ($timesent,$attachmsg); my %currattach = (); $timesent = &Apache::lonlocal::locallocaltime($postversions[$i]); - unless (&contains_block_html($messages->{$i})) { - &newline_to_br(\$messages->{$i}); - } + &newline_to_br(\$messages->{$i}); $$messages{$i}=&Apache::lontexconvert::msgtexconverted($$messages{$i}); $$subjects{$i}=~s/\n/\
/g; $$subjects{$i}=&Apache::lontexconvert::msgtexconverted($$subjects{$i}); @@ -1413,7 +1409,7 @@ sub get_post_contents { foreach my $key (sort(keys(%currattach))) { if ($$allattachments{$key}{'filename'} =~ m-^/uploaded/([^/]+/[^/]+)(/feedback)?(/?\d*)/([^/]+)$-) { my $fname = $1.$3.'/'.$4; - $$imsfiles{$idx}{$i} .= ''."\n"; + $$imsfiles{$idx}{$i} .= ''."\n"; $$attachtxt{$i}.= ''.$4.'
'; } } @@ -1486,6 +1482,7 @@ sub mail_screen { } my %lt = &Apache::lonlocal::texthash( + 'plch' => 'Please check at least one of the following feedback types:', 'myqu' => 'My question/comment/feedback:', 'title' => 'Title', 'reta' => 'Retained attachments', @@ -1673,10 +1670,7 @@ END {'add_entries' => \%onload}); if ($quote ne '') { - $quote = &HTML::Entities::decode($quote); - unless (&contains_block_html($quote)) { - &newline_to_br(\$quote); - } + &newline_to_br(\$quote); $quote='
'.&Apache::lontexconvert::msgtexconverted($quote).'
'; } @@ -1699,6 +1693,7 @@ END END } $r->print(< $quote

$lt{'myqu'}

@@ -1708,8 +1703,9 @@ $latexHelp

$lt{'title'}:

-

+

END if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) { if ($env{'form.origpage'}) { @@ -1731,7 +1727,6 @@ END } } else { $r->print(< $lt{'atta'} $attachmaxtext:

END @@ -1745,7 +1740,7 @@ END $r->print(< - +

END @@ -1952,9 +1947,9 @@ END $r->print(<$lt{'disa'}		 $lt{$discdisp} +
- + 		$lt{$disctogg}
- - - - - - - - - - - + + + + + + + + + + + @@ -2201,7 +2188,7 @@ $start_page
- + END if (exists($env{'form.group'})) { $r->print(''); @@ -2324,7 +2311,7 @@ END
- + $end_page END @@ -2427,7 +2414,7 @@ sub redirect_back { if ($previous > 0) { $qrystr = 'previous='.$previous; if ($feedurl =~ /\?register=1/) { - $feedurl .= '&'.$qrystr; + $feedurl .= '&'.$qrystr; } else { $feedurl .= '?'.$qrystr; } @@ -2436,14 +2423,14 @@ sub redirect_back { if (defined($sort)) { my $sortqry = 'sortposts='.$sort; if (($feedurl =~ /\?register=1/) || ($feedurl =~ /\?previous=/)) { - $feedurl .= '&'.$sortqry; + $feedurl .= '&'.$sortqry; } else { $feedurl .= '?'.$sortqry; } $sorttag = ''; if (defined($numpicks)) { my $userpickqry = 'totposters='.$numpicks; - $feedurl .= '&'.$userpickqry; + $feedurl .= '&'.$userpickqry; $userpicktag = ''; } else { if (ref($sectionpick) eq 'ARRAY') { @@ -2457,7 +2444,7 @@ sub redirect_back { $sectag =~ s/,$//; $sectag .= '" />'; } else { - $feedurl .= '&sectionpick='.$sectionpick; + $feedurl .= '§ionpick='.$sectionpick; $sectag = ''; } if (ref($grouppick) eq 'ARRAY') { @@ -2471,7 +2458,7 @@ sub redirect_back { $grptag =~ s/,$//; $grptag .= '" />'; } else { - $feedurl .= '&grouppick='.$grouppick; + $feedurl .= '&grouppick='.$grouppick; $grptag = ''; } if (ref($rolefilter) eq 'ARRAY') { @@ -2488,7 +2475,7 @@ sub redirect_back { $feedurl .= '&rolefilter='.$rolefilter; $roletag = ''; } - $feedurl .= '&statusfilter='.$statusfilter; + $feedurl .= '&statusfilter='.$statusfilter; $statustag =''; } } @@ -2577,22 +2564,6 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl,$symb) = @_; - my $crscontent = &mt('Question/Comment/Feedback about course content'); - my $crspolicy = &mt('Question/Comment/Feedback about course policy'); - my $contribdisc = &mt('Contribution to course discussion of resource'); - my $anoncontrib = &mt('Anonymous contribution to course discussion of resource'); - my $namevis = &mt('name only visible to course faculty'); - my $crstype; - if ($env{'request.course.id'}) { - $crstype = &Apache::loncommon::course_type(); - if ($crstype eq 'Community') { - $crscontent = &mt('Question/Comment/Feedback about community content'); - $crspolicy = &mt('Question/Comment/Feedback about community policy'); - $contribdisc = &mt('Contribution to community discussion of resource'); - $anoncontrib = &mt('Anonymous contribution to community discussion of resource'); - $namevis = &mt('name only visible to community facilitators'); - } - } my $msgoptions=''; my $discussoptions=''; unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) { @@ -2613,13 +2584,13 @@ sub screen_header { if (&feedback_available(0,1)) { $msgoptions.= '

'; } if (&feedback_available(0,0,1)) { $msgoptions.= '

'; } } @@ -2630,26 +2601,25 @@ sub screen_header { $env{'request.course.id'}. ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) { $discussoptions='
'. - + &mt('Contribution to course discussion of resource'); + $discussoptions.='
'. ''.&mt('Change Screenname').''; my $blockblog = &Apache::loncommon::blocking_status('blogs'); if (!$blockblog) { - $discussoptions.= &add_blog_checkbox($crstype); + $discussoptions.= &add_blog_checkbox(); } } } if ($msgoptions) { $msgoptions='

' - .' '.&mt('Send Feedback').'

'.&Apache::lonhtmlcommon::coursepreflink(&mt('Feedback Settings'),'feedback').'

' + .' '.&mt('Send Feedback').'' .$msgoptions; } if ($discussoptions) { - $discussoptions='

' - .' '.&mt('Discussion Contributions').'

'.&Apache::lonhtmlcommon::coursepreflink(&mt('Discussion Settings'),'discussion').'

' + $discussoptions='

' + .' '.&mt('Discussion Contributions').'

' .$discussoptions; } return $msgoptions.$discussoptions; @@ -2680,13 +2650,11 @@ sub clear_out_html { ($override)) { # allows


      • #

        - #

    • $lt{'soor'} $lt{'sprs'} $lt{'spur'} $lt{'spse'} $lt{'spgr'} $lt{'psub'}$lt{'soor'} $lt{'sprs'} $lt{'spur'} $lt{'spse'} $lt{'spgr'} $lt{'psub'}
    @@ -2173,11 +2161,10 @@ $start_page
    + # %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1, BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1, M=>1, ALGEBRA=>1, SUB=>1, SUP=>1, SPAN=>1, - H1=>1, H2=>1, H3=>1, H4=>1, H5=>1, H6=>1, - TABLE=>1, TR=>1, TD=>1, TH=>1, TBODY=>1); - + H1=>1, H2=>1, H3=>1, H4=>1, H5=>1); } # Do the substitution of everything that is not explicitly allowed $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/ @@ -2949,19 +2917,6 @@ sub show_preview { ); } -sub contains_block_html { - my ($message)=@_; - return ($message =~ m{ - <(br|h1|h2|h3|h4|h5|h6|p|ol|ul|table|pre|address|blockquote|center|div) - \s* - (\w+\=['"]\w+['"])* - \s* - ( - \s*/>| - >.* - )}xs - ); -} sub newline_to_br { my ($message)=@_; @@ -2995,7 +2950,7 @@ sub generate_preview_button { +onClick="if (typeof(document.$formname.onsubmit)=='function') {document.$formname.onsubmit();};this.form.comment.value=document.$formname.$fieldname.value;this.form.subject.value=document.$formname.subject.value;this.form.submit();" /> ENDPREVIEW } @@ -3050,7 +3005,7 @@ $toolarge
    @@ -3101,7 +3056,7 @@ END $r->print(''."\n"); } $r->print(< + $end_page END @@ -3293,8 +3248,7 @@ sub construct_attachmenturl { } sub add_blog_checkbox { - my ($crstype) = @_; - my $checkstatus; + my ($checkstatus); if ($env{'form.blog'}) { $checkstatus = 'checked="checked"'; } @@ -3308,13 +3262,8 @@ function setblogvalue() { } }
    -
    '."\n"; +
    '."\n"; return $output; } @@ -3338,9 +3287,8 @@ sub has_discussion { } sub sort_filter_names { - my ($sort_types,$role_types,$status_types,$crstype) = @_; - if (ref($sort_types) eq 'HASH') { - %{$sort_types} = ( + my ($sort_types,$role_types,$status_types) = @_; + %{$sort_types} = ( ascdate => 'Date order - oldest first', descdate => 'Date order - newest first', thread => 'Threaded', @@ -3348,30 +3296,24 @@ sub sort_filter_names { username => 'By domain and username', lastfirst => 'By last name, first name' ); - } - my @courseroles = qw(st in ta ep ad); - if ($crstype eq 'Community') { - push(@courseroles,'co'); - } else { - push(@courseroles,'cc'); - } - if (ref($role_types) eq 'HASH') { - foreach my $role (@courseroles) { - $role_types->{$role} = &Apache::lonnet::plaintext($role,$crstype); - } - $role_types->{'all'} = 'All roles'; - $role_types->{'cr'} = 'Custom role'; - } - if (ref($status_types) eq 'HASH') { - %{$status_types} = ( - all => 'Roles of any status', - Active => 'Only active roles', - Expired => 'Only past roles', - Future => 'Only future roles', - ); - } + %{$role_types} = ( + all => 'All roles', + st => 'Students', + cc => 'Course Coordinators', + in => 'Instructors', + ta => 'TAs', + ep => 'Exam proctors', + ad => 'Administrators', + cr => 'Custom roles' + ); + %{$status_types} = ( + all => 'Roles of any status', + Active => 'Only active roles', + Expired => 'Only past roles', + Future => 'Only future roles', + ); } - + sub handler { my $r = shift; if ($r->header_only) { @@ -3897,11 +3839,7 @@ ENDREDIR $env{'user.domain'}, 'CourseBlog_'.$env{'request.course.id'}, $subject,$message,$feedurl,'public'); - if (&Apache::loncommon::course_type() eq 'Community') { - $blog='
    '.&mt('Added to my community blog').'
    '; - } else { - $blog='
    '.&mt('Added to my course blog').'
    '; - } + $blog='
    '.&mt('Added to my course blog').'
    '; } # Receipt screen and redirect back to where came from
    - Subject: $subject

    + Subject: $subject

    END if ($idx) { if ($attachmenturls) { @@ -3078,7 +3033,7 @@ END
    - $lt{'adda'} + $lt{'adda'}