--- loncom/interface/loncoursegroups.pm	2008/12/16 23:52:08	1.80.2.3
+++ loncom/interface/loncoursegroups.pm	2008/12/16 16:44:28	1.84
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.80.2.3 2008/12/16 23:52:08 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.84 2008/12/16 16:44:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,10 +76,10 @@ sub handler {
 
     my %functions = (
                       email => 'E-mail',
-                      discussion => 'Discussion boards',
+                      discussion => 'Discussion Boards',
                       chat => 'Chat',
-                      files => 'File repository',
-                      roster => 'Membership roster',
+                      files => 'File Repository',
+                      roster => 'Membership Roster',
                       homepage => $ucgpterm.' home page',
                     );
 
@@ -1259,18 +1259,12 @@ sub reenable_folder {
 
 sub modify_folders {
     my ($cdom,$cnum,$groupname) = @_;
-    my ($outcome,$groupmap,$groupmapres,$map,$id,$src);
+    my $outcome;
     my $navmap = Apache::lonnavmaps::navmap->new();
-    if (!defined($navmap)) {
-        $outcome = '<div class="LC_error">'.
-                   &mt('Error reading course contents.').' '.
-                   &mt('You need to re-initialize the course.').
-                   '</div>';
-        return $outcome;
-    }
-    $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
+    my $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
                    $groupname.'.sequence';
-    $groupmapres = $navmap->getResourceByUrl($groupmap);
+    my $groupmapres = $navmap->getResourceByUrl($groupmap);
+    my ($map,$id,$src);
     if ($groupmapres) {
         ($map,$id,$src)=&Apache::lonnet::decode_symb($groupmapres->symb());
     }
@@ -1674,8 +1668,8 @@ END
        <td class="LC_description">'.&mt('Granularity:').'</td>
        <td colspan="10">'.$lt{'doyo'}.'&nbsp;<label><input type="radio" name="granularity" value="Yes" />'.&mt('Yes').'</label>&nbsp;<label><input type="radio" name="granularity" value="No" checked="checked" />'.&mt('No').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;('.&mt('Currently set to "[_1]"',
-                                      &mt($$stored{'granularity'})).')');
+        $r->print('&nbsp;&nbsp;('.&mt('Currently set to [_1].'
+                                      ,'"'.&mt($$stored{'granularity'}).'"').')');
     }
     $r->print('
        </td>
@@ -3228,49 +3222,36 @@ sub write_group_data {
                 my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
                 my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
                 my $navmap = Apache::lonnavmaps::navmap->new();
-                my ($bbmapres,$error);
-                if (defined($navmap)) {
-                    $bbmapres = $navmap->getResourceByUrl($boardsmap);
-                    undef($navmap);
-                    if (!$bbmapres) {
-                        my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
-                        my $disctitle = &mt('Discussion Boards');
-                        my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
-                                                   $groupname.'.sequence','bbseq',
-                                                   $disctitle,$grpmap);
-                        my ($furl,$ferr) =
-                            &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
-                        # modify parameter
-                        if ($outcome eq 'ok') {
-                            $navmap = Apache::lonnavmaps::navmap->new();
-                            if (defined($navmap)) {
-                                my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
-                                                               $groupname);
-                                if ($parm_result) {
-                                    $error = &mt('An error occurred while setting parameters '
-                                             .'for Discussion Boards folder: '
-                                             .'[_1]',$parm_result);
-                                } else {
-                                    $r->print('<div class="LC_success">'.
-                                              &mt('Discussion Boards Folder created.')
-                                              .'</div>');
-                                }
-                                undef($navmap);
-                            } else {
-                                $error = &mt('An error occurred while setting parameters '.
-                                             'for Discussion Boards folder: '.
-                                             'Could not retrieve course information' );
-                            }
+                my $bbmapres = $navmap->getResourceByUrl($boardsmap);
+                undef($navmap);
+                if (!$bbmapres) {
+                    my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
+                    my $disctitle = &mt('Discussion Boards');
+                    my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
+                                               $groupname.'.sequence','bbseq',
+                                               $disctitle,$grpmap);
+                    my ($furl,$ferr) = 
+                        &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                    $navmap = Apache::lonnavmaps::navmap->new();
+                    # modify parameter
+                    if ($outcome eq 'ok') {
+                        my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
+                                                       $groupname);
+                        if ($parm_result) {
+                            $r->print('<div class="LC_error">'
+                                     .&mt('An error occurred while setting parameters '
+                                         .'for Discussion Boards folder: '
+                                         .'[_1]',$parm_result)
+                                     .'</div>');
                         } else {
-                            $r->print($outcome);
+                            $r->print('<div class="LC_success">'
+                                     .&mt('Discussion Boards Folder created.')
+                                     .'</div>');
                         }
+                    } else {
+                        $r->print($outcome);
                     }
-                } else {
-                    $error = &mt("An error occurred while retrieving the contents of the group's folder.").'<br />'.
-                             &mt('You need to re-initialize the course.');
-                }
-                if ($error ne '') {
-                    $r->print('<div class="LC_error">'.$error.'</div>');
+                    undef($navmap);
                 }
             }
             $r->print('<div class="LC_success">'
@@ -3528,7 +3509,6 @@ sub mapping_options {
         'adds'  => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
         'drops'  => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.",
         'pirs' => "Pick roles and sections for automatic $gpterm enrollment",
-        'curr' => 'Currently set to',
         'on' => 'on',
         'off' => 'off',
         'auad' => "Automatically enable $gpterm membership when roles are added?",
@@ -3556,14 +3536,14 @@ sub automapping {
    <span class="LC_nobreak">'.$$lt{'auad'}.':&nbsp;
     <label><input type="radio" name="autoadd" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autoadd" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$add}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$add}.'</b>').')');
     }
     $r->print('
     </span><br />
     <span class="LC_nobreak">'.$$lt{'auex'}.':&nbsp;
     <label><input type="radio" name="autodrop" value="on" />'.&mt('on').'&nbsp;&nbsp;</label><label><input type="radio" name="autodrop" value="off" checked="checked" />'.&mt('off').'</label>');
     if ($action eq 'modify') {
-        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.$$lt{'curr'}.' <b>'.$$lt{$drop}.'</b>)');
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;('.&mt('Currently set to [_1].','<b>'.$$lt{$drop}.'</b>').')');
     }
     $r->print('</span><br /><br />'.$$lt{'mapr'});
 }
@@ -3847,10 +3827,6 @@ sub add_group_folder {
     }
     my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
     my $navmap = Apache::lonnavmaps::navmap->new();
-    if (!defined($navmap)) {
-        return $warning.'<span class="LC_error">'.&mt('Error retrieving course contents').
-               ' '.&mt('You need to re-initialize the course.').'</span>';
-    }
     # modify parameters
     my $parm_result;
     if ($action eq 'create') {
@@ -3956,13 +3932,6 @@ sub new_map {
 sub parm_setter {
     my ($navmap,$cdom,$url,$groupname) = @_;
     my $allresults;
-    if (!defined($navmap)) {
-        $allresults = '<div class="LC_warning">'.
-                      &mt('Parameters not set for [_1] because the contents of the course could not be retrieved.',$url).' '.
-                      &mt('You need to reinitialize the course.').
-                      '</div>';
-        return $allresults;
-    }
     my %hide_settings = (
                            'course' =>  {
                                           'num' => 13,