--- loncom/interface/lonsimplepage.pm	2013/09/17 15:04:30	1.103
+++ 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.103 2013/09/17 15:04:30 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.107 2021/11/30 15:55:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -187,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 {
@@ -206,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());
@@ -348,7 +350,8 @@ sub handler {
 				my %fields = %{$fields_ref};
 				$r->print('<br /><input type="hidden" name="'.$field.
 					'" value="'.$data{$field}.'" />');
-				&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('<br />');
 			}
         };
@@ -367,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') {
@@ -385,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&amp;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 = '<table cellspacing="4" cellpadding="4">';
-        } else {
-            $output = &Apache::loncommon::start_data_table();
-        }
-        foreach my $tool (@available) {
-            if ($target eq 'tex') {
-                $output .= '<tr><td>'.&mt($menu{$tool}{text}).'</td></tr>';
-            } else {
-                $output .= &Apache::loncommon::start_data_table_row()
-                          .'<td><a href="'.$menu{$tool}{href}.'">'
-                          .&mt($menu{$tool}{text}).'</a></td>'
-                          .&Apache::loncommon::end_data_table_row();
-            }
-        }
-        if ($target eq 'tex') {
-            $output .= '</table>';
-        } else {
-            $output .= &Apache::loncommon::end_data_table();
-        }
-        if ($target eq 'tex') {
-            $r->print(&Apache::lonxml::xmlparse($r,'tex',&mt('Available functions').'<br /><br />'.$output));
-        } else {
-            $r->print('<h3>'.&mt('Available Group Tools').'</h3>'.$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].','<b>'.&unescape($groupinfo{'description'}).'</b>');
-        }
-        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();
@@ -465,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},
            ];
 }