--- loncom/interface/loncoursegroups.pm	2006/05/25 22:39:59	1.22
+++ loncom/interface/loncoursegroups.pm	2006/06/23 00:22:58	1.25
@@ -1,3 +1,6 @@
+# The LearningOnline Network with CAPA
+#
+# $Id: loncoursegroups.pm,v 1.25 2006/06/23 00:22:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +35,8 @@ use Apache::lonlocal;
 use Apache::lonnavmaps;
 use Apache::longroup;
 use Apache::Constants qw(:common :http);
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my ($r) = @_;
@@ -235,7 +240,7 @@ END
                         $rowColor = $rowColor2;
                     }
                     my $description = 
-                   &Apache::lonnet::unescape($grp_info{$group}{'description'});
+                   &unescape($grp_info{$group}{'description'});
                     my $creator = $grp_info{$group}{'creator'};
                     my $creation = $grp_info{$group}{'creation'};
                     my $modified = $grp_info{$group}{'modified'}; 
@@ -300,7 +305,7 @@ END
                 foreach my $group (@coursegroups) {
                     my %group_info =  &Apache::longroup::get_group_settings(
                                         $curr_groups{$group});
-                    my $description = &Apache::lonnet::unescape(
+                    my $description = &unescape(
                                         $group_info{description});
                     my ($uname,$udom) = split(/:/,$group_info{creator});
                     $r->print('<font size="+1"><a href="/adm/'.$udom.'/'.$uname.'/'.$group.'/grppg">'.$group,'</a><font><br /><small>'.$description.'</small><br /><br />');
@@ -416,7 +421,9 @@ sub group_administration {
 	 files      => {
 	     rgf => 'Retrieve',
 	     ugf => 'Upload',
+             mgf => 'Modify',
 	     dgf => 'Delete',
+             agf => 'Control Access',
 	 },
 	 roster     => {
 	     vgm => 'View',
@@ -867,7 +874,7 @@ sub retrieve_settings {
     my %stored;
 
     $stored{'description'} = 
-	&Apache::lonnet::unescape($groupinfo{'description'});
+	&unescape($groupinfo{'description'});
     $stored{'startdate'} = $groupinfo{'startdate'};
     $stored{'enddate'} = $groupinfo{'enddate'};
     if ($stored{'enddate'} == 0) {
@@ -2128,8 +2135,8 @@ sub current_membership {
 			uname     => $uname,
 			udom      => $udom,
 			start     => &Apache::lonlocal::locallocaltime($start),
-			currtools => [];
-			newtools  => [];
+			currtools => [],
+			newtools  => [],
 		    };
 
                     if ($end == 0) {
@@ -2861,7 +2868,7 @@ sub write_group_data {
         $creation = $$stored{'creation'};
         $creator = $$stored{'creator'};
     }
-    my $esc_description = &Apache::lonnet::escape($description);
+    my $esc_description = &escape($description);
     my @single_attributes = ('description','functions','startdate','enddate',
                              'creation','modified','creator','granularity',
                              'specificity','autoadd','autodrop');
@@ -3450,7 +3457,7 @@ sub date_setting_table {
 sub create_homepage {
     my ($cdom,$cnum,$name,$groupinfo,$tools) = @_;
     my $functionality = join(',',@{$tools});
-    my $content = &Apache::lonnet::unescape($$groupinfo{description});
+    my $content = &unescape($$groupinfo{description});
     $content=~s/\s+$//s;
     $content=~s/^\s+//s;
     $content=~s/\<br\s*\/*\>$//s;