--- loncom/interface/lonsimplepage.pm 2013/03/11 02:04:36 1.102 +++ loncom/interface/lonsimplepage.pm 2021/11/30 15:55:37 1.107 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.102 2013/03/11 02:04:36 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.107 2021/11/30 15:55:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,8 +33,7 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lontemplate; use Apache::lonnet; -use Apache::lontexconvert; -use Apache::lonfeedback; +use Apache::lonhtmlgateway; use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; @@ -188,7 +187,8 @@ sub handler { if ($has_group_access) { if ((!$group_home_edit) && (!$group_home_view) && (!$group_view_perm) && (!$group_edit_perm)) { - &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + $r->print(&Apache::longroup::display_group_links($r,$env{'form.grade_target'},$group, + 'view',$refarg,undef,undef,%groupinfo)); if ($env{'form.grade_target'} ne 'tex') { $r->print(&Apache::loncommon::end_page()); } else { @@ -207,8 +207,9 @@ sub handler { } return OK; } + my $clientip = &Apache::lonnet::get_requestor_ip($r); my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('groups'); + &Apache::loncommon::blocking_status('groups',$clientip); if ($blocked) { $r->print($blocktext); $r->print(&Apache::loncommon::end_page()); @@ -259,10 +260,8 @@ sub handler { foreach my $syl_field (keys(%syllabusfields)) { my $field=$env{'form.'.$syl_field}; chomp($field); - $field=~s/\s+$//s; - $field=~s/^\s+//s; - $field=~s/\$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); + my $gateway = Apache::lonhtmlgateway->new(); + $field = $gateway->process_incoming_html($field,1); $syllabus{$syl_field}=$field; } $syllabus{'uploaded.lastmodified'}=time; @@ -351,7 +350,8 @@ sub handler { my %fields = %{$fields_ref}; $r->print('
'); - &display_group_links($r, $target, $group, 'edit', $refarg, %groupinfo); + $r->print(&Apache::longroup::display_group_links($r,$target,$group,'edit', + $refarg,undef,undef,%groupinfo)); $r->print('
'); } }; @@ -370,7 +370,7 @@ sub handler { } else { if ($group ne '') { - &display_group_links($r,$target,$group,'view',$refarg,%groupinfo); + $r->print(&Apache::longroup::display_group_links($r,$target,$group,'view',$refarg,undef,undef,%groupinfo)); } else { my $text=&mt('No page information provided.'); if ($target ne 'tex') { @@ -388,79 +388,6 @@ sub handler { return OK; } -sub display_group_links { - my ($r,$target,$group,$context,$refarg,%groupinfo) = @_; - my @available = (); - my %menu = (); - %{$menu{'email'}} = ( - text => 'Group Message', - href => '/adm/email?compose=group&group='.$group. - $refarg, - ); - %{$menu{'discussion'}} = ( - text => 'Discussion Boards', - href => '/adm/groupboards?group='.$group.$refarg, - ); - %{$menu{'chat'}} = ( - text => 'Group Chat Room', - href => "javascript:group_chat('$group')", - ); - %{$menu{'files'}} = ( - text => 'Group Portfolio', - href => '/adm/coursegrp_portfolio?group='.$group. - $refarg, - ); - %{$menu{'roster'}} = ( - text => 'Membership Roster', - href => '/adm/grouproster?group='.$group.$refarg, - ); - foreach my $tool (sort(keys(%menu))) { - if ($groupinfo{functions}{$tool} eq 'on') { - push(@available,$tool); - } - } - if (@available > 0) { - my $output = ''; - if ($target eq 'tex') { - $output = ''; - } else { - $output = &Apache::loncommon::start_data_table(); - } - foreach my $tool (@available) { - if ($target eq 'tex') { - $output .= ''; - } else { - $output .= &Apache::loncommon::start_data_table_row() - .'' - .&Apache::loncommon::end_data_table_row(); - } - } - if ($target eq 'tex') { - $output .= '
'.&mt($menu{$tool}{text}).'
' - .&mt($menu{$tool}{text}).'
'; - } else { - $output .= &Apache::loncommon::end_data_table(); - } - if ($target eq 'tex') { - $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'

'.$output)); - } else { - $r->print('

'.&mt('Available Group Tools').'

'.$output); - } - } else { - my $output; - if ($context eq 'edit') { - $output = &mt('No group functionality.'); - } else { - $output = &mt('No group functionality (e.g., e-mail, discussion, chat room or file upload) is currently available to you in this group: [_1].',''.&unescape($groupinfo{'description'}).''); - } - if ($target eq 'tex') { - $r->print(&Apache::lonxml::xmlparse($r,'tex',$output)); - } else { - $r->print($output); - } - } -} - sub grouppage_breadcrumbs { my ($cdom,$cnum,$group,$description) = @_; &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -468,8 +395,9 @@ sub grouppage_breadcrumbs { text=>"Groups", title=>"Display Groups"}, {href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist", - text=>&mt('Group:')." $description", - title=>"Go to group's home page"}, + text=>&mt('Group').": $description", + title=>&mt("Go to group's home page"), + no_mt=>1}, ]; }