--- loncom/interface/loncoursegroups.pm	2010/02/23 14:18:12	1.110
+++ loncom/interface/loncoursegroups.pm	2012/07/21 21:20:06	1.114
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.110 2010/02/23 14:18:12 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.114 2012/07/21 21:20:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,7 +135,7 @@ function changeSort(caller) {
 function openGroupRoster(group,status) {
     var url = '/adm/grouproster?';
     url += 'group='+group+'&status='+status+'&ref=popup';
-    var title = 'Group Membership';
+    var title = 'Group_Membership';
     var options = 'scrollbars=1,resizable=1,menubar=0';
     options += ',width=700,height=600';
     rosterbrowser = open(url,title,options,'1');
@@ -333,7 +333,8 @@ END
                         $link .= $group;
                     } else {
                         $link .= 
-                            &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap).'&ref=grouplist';
+                            &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap);
+                        $link .= (($link=~/\?/)?'&':'?').'ref=grouplist';
                         if (exists($env{'form.refpage'})) {
                             $link .= '&refpage='.$env{'form.refpage'};
                         }
@@ -1275,7 +1276,7 @@ sub reenable_folder {
         $LONCAPA::map::resources[$idx] = $foldertitle.':'.$mapurl.
                                          ':false:normal:res';
         $LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx;
-        my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1);
+        my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1,1);
         if ($errtext) {
             $outcome='<div class="LC_error">'
                     .&mt('An error occurred when saving updated parent folder to group:'
@@ -1340,7 +1341,7 @@ sub modify_folders {
                     $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1];
                 }
                 $#LONCAPA::map::order--;
-                my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+                my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,1);
                 if ($errtext) {
                     $outcome='<div class="LC_error">'
                             .&mt('An error occurred when saving updated parent folder to group:')
@@ -1546,16 +1547,19 @@ sub build_members_list {
 sub group_files {
     my ($group,$portpath,$numfiles,$numdirs) = @_;
     my $dirptr=16384;
-    my @dir_list=&Apache::portfolio::get_dir_list($portpath,undef,$group);
-    foreach my $line (@dir_list) {
-        my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
-        if (($filename !~ /^\.\.?$/) && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/) && ($filename ne 'no_such_dir')) { 
-            if ($dirptr&$testdir) {
-                $portpath .= '/'.$filename;
-                $$numdirs ++;
-                &group_files($group,$portpath,$numfiles,$numdirs)
-            } else {
-                $$numfiles ++;
+    my ($dirlistref,$listerror) = 
+        &Apache::portfolio::get_dir_list($portpath,undef,$group);
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $line (@{$dirlistref}) {
+            my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+            if (($filename !~ /^\.\.?$/) && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/) && ($filename ne 'no_such_dir')) { 
+                if ($dirptr&$testdir) {
+                    $portpath .= '/'.$filename;
+                    $$numdirs ++;
+                    &group_files($group,$portpath,$numfiles,$numdirs)
+                } else {
+                    $$numfiles ++;
+                }
             }
         }
     }
@@ -4029,7 +4033,7 @@ sub map_updater {
         $LONCAPA::map::resources[$newidx] = $itemtitle.':'.$newmapurl.
                                                  ':false:normal:res';
         $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx;
-        my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1);
+        my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1,1);
         if ($errtext) {
             $outcome = '<div class="LC_error">'
                       .&mt('Error saving updated parent folder.')." ($parentmap):  $errtext"