--- loncom/interface/lonaboutme.pm 2012/12/07 17:15:56 1.153 +++ loncom/interface/lonaboutme.pm 2014/06/19 00:36:29 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network # Personal Information Page # -# $Id: lonaboutme.pm,v 1.153 2012/12/07 17:15:56 raeburn Exp $ +# $Id: lonaboutme.pm,v 1.157 2014/06/19 00:36:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,11 +78,12 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonnet; use Apache::lontexconvert; -use Apache::lonfeedback; +use Apache::lonhtmlgateway; use Apache::lonrss(); use Apache::lonlocal; use Apache::lonmsgdisplay(); use Apache::lontemplate; +use Apache::longroup; use HTML::Entities(); use Image::Magick; @@ -312,8 +313,9 @@ sub handler { if (($allowed) && ($env{'form.storesyl'})) { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,$env{'user.adv'}); + chomp($field); + my $gateway = Apache::lonhtmlgateway->new(); + $field = $gateway->process_incoming_html($field,1); $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -405,7 +407,7 @@ sub handler { if ($target ne 'tex') { $r->print(''); if ($env{'form.popup'}) { - $r->print('

'.&mt('Close window').''); + $r->print('

'.&mt('Close window').'

'); } $r->print(&Apache::loncommon::end_page()); } else { @@ -540,7 +542,7 @@ sub display_portfolio_header { title => &mt('Go to personal information page for [_1]',$name), no_mt => 1}, {href => "/adm/$cdom/$cnum/aboutme/portfolio".$query_string, - text => 'Viewable files', + text => &mt('Viewable files'), title => &mt('Viewable portfolio files for [_1]',$name), no_mt => 1} ]; @@ -629,9 +631,12 @@ sub portfolio_files { my $diroutput; if ($is_course) { my %files_by_group; + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); foreach my $filename (sort(keys(%access_controls))) { my ($group,$path) = split('/',$filename,2); - $files_by_group{$group}{$path} = $access_controls{$filename}; + if (exists($curr_groups{$group})) { + $files_by_group{$group}{$path} = $access_controls{$filename}; + } } foreach my $group (sort(keys(%files_by_group))) { my %fileshash;