--- loncom/interface/longroup.pm	2006/07/08 00:52:45	1.9
+++ loncom/interface/longroup.pm	2006/11/28 19:46:00	1.13
@@ -40,14 +40,17 @@ Input:
 1. Optional course domain
 2. Optional course number
 3. Optional group name
+4. Optional namespace
 
 Course domain and number will be taken from user's
 environment if not supplied. Optional group name will 
-be passed to lonnet::get_coursegroups() as a regexp to
-use in the call to the dump function.
+be passed to lonnet function as a regexp to
+use in the call to the dump function.  Optional namespace
+will determine whether information is retrieved about current 
+groups (default) or deleted groups (namespace = deleted_groups). 
 
 Output
-Returns hash of groups in the course (subject to the
+Returns hash of groups in a course (subject to the
 optional group name filter). In the hash, the keys are
 group names, and their corresponding values
 are scalars containing group information in XML. This
@@ -60,7 +63,7 @@ None.
 ###############################################
 
 sub coursegroups {
-    my ($cdom,$cnum,$group) = @_;
+    my ($cdom,$cnum,$group,$namespace) = @_;
     if (!defined($cdom) || !defined($cnum)) {
         my $cid =  $env{'request.course.id'};
 
@@ -69,12 +72,16 @@ sub coursegroups {
         $cdom = $env{'course.'.$cid.'.domain'};
         $cnum = $env{'course.'.$cid.'.num'};
     }
-    my %curr_groups = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
-    if (my $tmp = &Apache::lonnet::error(%curr_groups)) {
-	undef(%curr_groups);
-        &Apache::lonnet::logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom);
+    if (!defined($namespace)) {
+        $namespace = 'coursegroups';
+    } 
+    my %groups =  &Apache::lonnet::get_coursegroups($cdom,$cnum,$group,
+                                                    $namespace);
+    if (my $tmp = &Apache::lonnet::error(%groups)) {
+	undef(%groups);
+        &Apache::lonnet::logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom.' - '.$namespace);
     }
-    return %curr_groups;
+    return %groups;
 }
 
 ###############################################
@@ -439,8 +446,8 @@ sub get_tool_privs {
         discussion => {
             cgb => 'Create boards',
             pgd => 'Post',
-            pag => 'Anon. posts',
-            rgi => 'Get identities',
+            egp => 'Edit own posts',
+            dgp => 'Hide/Delete any post',
             vgb => 'View boards',
         },
         chat       => {
@@ -454,7 +461,8 @@ sub get_tool_privs {
             agf => 'Control Access',
         },
         roster     => {
-            vgm => 'View',
+            vgm => 'Basic Display',
+            vmd => 'Detailed Display',
         },
         homepage   => {
             vgh => 'View page',
@@ -519,7 +527,7 @@ sub group_memberlist {
                         $current{$user}{'status'} = 'active';
                         $member_nums{'active'} ++;
                     }
-                    if (@userprivs > 0) {
+                    if ((@userprivs > 0) && (ref($fixedprivs) eq 'HASH')) {
                         foreach my $tool (sort(keys(%{$fixedprivs}))) {
                             foreach my $priv (keys(%{$$fixedprivs{$tool}})) {
                                 if (grep/^$priv$/,@userprivs) {
@@ -530,7 +538,7 @@ sub group_memberlist {
                         }
                         $hastools = 1;
                     }
-                    if (@{$available} > 0) {
+                    if ((ref($available) eq 'ARRAY') && (@{$available} > 0)) {
                         if (@{$current{$user}{currtools}} > 0) {
                             if ("@{$available}" ne "@{$current{$user}{currtools}}") {
                                 foreach my $tool (@{$available}) {
@@ -565,7 +573,7 @@ sub group_memberlist {
             }
         }
     }
-    return (\%current,$hastools,$addtools,\%member_nums);
+    return (\%current,\%member_nums,$hastools,$addtools);
 }
 
 ###############################################
@@ -621,7 +629,7 @@ sub get_bbfolder_url {
 ###############################################
 
 sub get_group_bbinfo {
-    my ($cdom,$cnum,$group) = @_;
+    my ($cdom,$cnum,$group,$boardurl) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my @groupboards;
     my %boardshash;
@@ -632,12 +640,23 @@ sub get_group_bbinfo {
             my @boards = $navmap->retrieveResources($bbfolderres,undef,0,0);
             foreach my $res (@boards) {
                 my $url = $res->src();
-                if ($url =~ m|^/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard|) {
-                    push(@groupboards,$res->symb());
-                    $boardshash{$res->symb()} = {
-                                                  title => $res->title(),
-                                                  url   => $res->src(),
-                                                };
+                if ($url =~ m|^(/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard)|) {
+                    if ($boardurl) {
+                        if ($boardurl =~ /^\Q$1\E/) {
+                            push(@groupboards,$res->symb());
+                            $boardshash{$res->symb()} = {
+                                                        title => $res->title(),
+                                                        url   => $res->src(),
+                                                        };
+                            last;
+                        }
+                    } else {
+                        push(@groupboards,$res->symb());
+                        $boardshash{$res->symb()} = {
+                                                      title => $res->title(),
+                                                      url   => $res->src(),
+                                                    };
+                    }
                 }
             }
         }