--- loncom/interface/groupboards.pm	2006/06/30 08:14:31	1.1
+++ loncom/interface/groupboards.pm	2006/06/30 18:27:19	1.4
@@ -25,7 +25,7 @@
 #
 
 package Apache::groupboards;
-                                                                                
+
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::loncommon;
@@ -73,22 +73,20 @@ sub handler {
     if (defined($env{'form.newbul'})) {
         if (($can_create) || (&Apache::lonnet::allowed('mdg',$env{'request.course.id'}))) {
             $r->print(&Apache::loncommon::start_page($bodytitle));
-            my ($outcome,$symb,$newurl,$bbtitle) = &create_board($cdom,$cnum,
-                                                                 $group,
-                                                          $env{'form.newbul'});
+            my ($outcome,$newurl,$bbtitle) = 
+		&create_board($cdom,$cnum,$group,$env{'form.newbul'});
             if ($outcome eq 'ok') {
                 my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
                 $r->print(&mt('The new discussion board was added successfully.<br />'));
                 $r->print('<table border="0"><tr><td>'.
-                          '<a href="'.$newurl.'?register=1&symb='.$symb.
-                          '&group='.$group.'">'.
+                          '<a href="'.$newurl.'?group='.$group.'">'.
                           &mt('Edit [_1] board',$bbtitle).'</a></td>'.
                            '<td>&nbsp;&nbsp;</td><td>'.
                           '<a href="/adm/groupboards?group='.$group.'">'.
                           &mt('View all group discussion boards').
                           '</a></td></tr></table>');
             } else {
-                $r->print(&mt('There was a problem creating the new discussion board - [_1]',$outcome).'<br /><a href="/adm/groupboards?group='.$group.'">'.
+                $r->print(&mt('There was a problem creating the new discussion board - [_1]','<span class="LC_error">'.$outcome.'</span>').'<br /><a href="/adm/groupboards?group='.$group.'">'.
                          &mt('Return to discussion boards').'</a>');
             }
             $r->print(&Apache::loncommon::end_page());
@@ -116,27 +114,8 @@ function makebulboard() {
         return OK;
     }
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @groupboards;
-    my %boards;
-    my $grpbbmap = &get_bbfolder_url($cdom,$cnum,$group);
-    if ($grpbbmap) {
-        my $bbfolderres = $navmap->getResourceByUrl($grpbbmap);
-        if ($bbfolderres) {
-            my @boards = $navmap->retrieveResources($bbfolderres,undef,0,0);
-            foreach my $res (@boards) {
-                my $url = $res->src();
-                my $title = $res->title();
-                my $symb = $res->symb();
-                if ($url =~ m|^/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard|) {
-                    push(@groupboards,$symb);
-                    %{$boards{$symb}} = (
-                                        title => $title,
-                                        url => $url,
-                                     );
-                }
-            }
-        }
-    }
+    my ($groupboards,$boards) = &Apache::longroup::get_group_bbinfo($cdom,$cnum,
+                                                                    $group);
     if (($can_create) || (&Apache::lonnet::allowed('mdg',$env{'request.course.id'}))) {
         $r->print('<form method="post" name="newbb" action="/adm/groupboards">'.
                   "\n".'<input type="button" name="bbbutton" value="'.
@@ -146,9 +125,9 @@ function makebulboard() {
                   '  <input type="hidden" name="group" value="'.$group.'" />'.
                   "\n".'</form><br />');
     }
-    if (@groupboards) {
-        foreach my $board (@groupboards) {
-            $r->print('<a href="'.$boards{$board}{'url'}.'?register=1&symb='.$board.'&group='.$group.'">'.$boards{$board}{'title'}.'</a><br />');
+    if (@{$groupboards} > 0) {
+        foreach my $board (@{$groupboards}) {
+            $r->print('<a href="'.$$boards{$board}{'url'}.'?group='.$group.'">'.$$boards{$board}{'title'}.'</a><br />');
         }
     } else {
         $r->print(&mt('There are currently no discussion boards in this [_1].',
@@ -159,49 +138,33 @@ function makebulboard() {
 }
 
 sub create_board {
-    my ($cdom,$cnum,$group,$newboard,$symb) = @_;
+    my ($cdom,$cnum,$group,$newboard) = @_;
     my ($bbtitle,$newurl)=split(/\=/,$newboard);
     $bbtitle=&unescape($bbtitle);
     $newurl=&unescape($newurl);
-    my $allbbsmap = &get_bbfolder_url($cdom,$cnum,$group);
-    my ($outcome,$symb);
+    my $allbbsmap = &Apache::longroup::get_bbfolder_url($cdom,$cnum,$group);
+    my ($outcome);
     if ($allbbsmap =~ m|^/uploaded|) {
         my ($errtext,$fatal)=&Apache::lonratedt::mapread($allbbsmap);
         if (!$fatal) {
             my $newidx=&Apache::lonratedt::getresidx($newurl);
             $Apache::lonratedt::resources[$newidx]=$bbtitle.':'.$newurl.
                                                    ':false:normal:res';
-            $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
+            push(@Apache::lonratedt::order,$newidx);
             my ($errtext,$fatal)=&Apache::lonratedt::storemap($allbbsmap,1);
             if ($fatal) {
-                $outcome = "Error: failed to store discussion boards map - $errtext\n";
+                $outcome = "error: failed to store discussion boards map - $errtext\n";
             } else {
                 $outcome = 'ok';
-                $symb = &Apache::lonnet::encode_symb($allbbsmap,$newidx,$newurl);
             }
         } else {
-            $outcome = "Error: failed to read all discussion boards map - $errtext\n";
+            $outcome = "error: failed to read all discussion boards map - $errtext\n";
         }
     } else {
-        $outcome = 'Error: discussion boards folder absent, '.
+        $outcome = 'error: discussion boards folder absent, '.
                    'or in unexpected location - '.$allbbsmap."\n";
     }
-    return ($outcome,$symb,$newurl,$bbtitle);
-}
-
-sub get_bbfolder_url {
-    my ($cdom,$cnum,$group) = @_;
-    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-    my $grpbbmap;
-    if (%curr_groups) {
-        my %group_info =  &Apache::longroup::get_group_settings(
-                                                    $curr_groups{$group});
-        my $creation = $group_info{'creation'};
-        my $bbfolder = $creation + 1;
-        my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
-        $grpbbmap = $crspath.'default_'.$bbfolder.'.sequence';
-    }
-    return $grpbbmap;
+    return ($outcome,$newurl,$bbtitle);
 }
 
 1;