--- loncom/interface/portfolio.pm	2006/07/19 21:59:10	1.121.2.8
+++ loncom/interface/portfolio.pm	2006/06/27 15:37:17	1.122
@@ -1,8 +1,3 @@
-# The LearningOnline Network
-# portfolio browser
-#
-# $Id: portfolio.pm,v 1.121.2.8 2006/07/19 21:59:10 albertel Exp $
-#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -36,53 +31,32 @@ use Apache::lonfeedback;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::longroup;
-use Apache::lonhtmlcommon;
 use HTML::Entities;
 use LONCAPA;
 
-sub group_args {
-    my $output;
-    if (defined($env{'form.group'})) {
-        $output .= '&group='.$env{'form.group'};
-	if (defined($env{'form.ref'})) {
-	    $output .= '&ref='.$env{'form.ref'};
-	}
-    }
-    return $output;
-}
-
-sub group_form_data {
-    my $output;
-    if (defined($env{'form.group'})) {
-	$output = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
-	if (exists($env{'form.ref'})) {
-	    $output .= '<input type="hidden" name="ref" value="'.
-		$env{'form.ref'}.'" />';
-	}
-    }
-    return $output;
-} 
-
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
     my ($url, $filename, $current_path, $current_mode, $field_name,
-        $continue_select) = @_;
+        $continue_select,$group) = @_;
     if ($continue_select ne 'true') {$continue_select = 'false'};
     my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;
-    $anchor .= &group_args();
+    if (defined($group)) {
+        $anchor .= '&amp;group='.$group;
+    }
     $anchor .= '">'.$filename.'</a>';
     return $anchor;
 }
-
 my $dirptr=16384;
 sub display_common {
-    my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;
-    my $namespace = &get_namespace();
-    my $port_path = &get_port_path();
+    my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_;
+    my $namespace = &get_namespace($group);
+    my $port_path = &get_port_path($group);
     if ($can_upload) {
-        my $groupitem = &group_form_data();
-
+        my $groupitem;
+        if (defined($group)) {
+            $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+        } 
         my $iconpath= $r->dir_config('lonIconsURL') . "/";
         my %text=&Apache::lonlocal::texthash(
 					 'upload' => 'Upload',
@@ -129,36 +103,43 @@ sub display_common {
 TABLE
     }
     my @tree = split (/\//,$current_path);
-    $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
+    $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
+            $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
         }
     }
     $r->print('</span>');
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
-    $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.&group_args());
+    $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"});
+    if (defined($group)) {
+        $r->print('&amp;group='.$group);
+    }
     $r->print('">'.
 	      &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
 }
-
 sub display_directory {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my ($groupitem,$groupecho);
     my $display_out;
     my $select_mode;
     my $checked_files;
-    my $port_path = &get_port_path();
-    my ($uname,$udom) = &get_name_dom();
+    my $port_path = &get_port_path($group);
+    my ($uname,$udom) = &get_name_dom($group);
     my $access_admin_text = &mt('View Status');
     if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');
     }
+    if ((defined($group)) && (defined($env{'request.course.id'}))) {
+       $groupitem = '<input type="hidden" name="group" value="'.$group.'" />'; 
+       $groupecho = '&amp;group='.$group;
+    }
 
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);
@@ -172,8 +153,7 @@ sub display_directory {
 	$select_mode = 'true';
     } 
     if ($is_empty && ($current_path ne '/') && $can_delete) {
-        $display_out = '<form method="post" action="'.$url.'">'.
-	    &group_form_data().
+        $display_out = '<form method="post" action="'.$url.'">'.$groupitem.
         '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
         '<input type="hidden" name="selectfile" value="" />'.
@@ -192,8 +172,9 @@ sub display_directory {
         $r->print('<table id="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }
-    $r->print("\n".&group_form_data()."\n");
-
+    if (defined($group)) {
+        $r->print("\n".$groupitem."\n");
+    }
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;
@@ -225,7 +206,7 @@ sub display_directory {
                 }
 		$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>'); 
+                $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
@@ -237,8 +218,8 @@ sub display_directory {
                     $version_flag = "";
                 }
                my $fullpath = $current_path.$filename;
-                $fullpath = &prepend_group($fullpath);
-                if ($select_mode eq 'true') {
+                $fullpath = &prepend_group($fullpath,$group);
+                if ($select_mode eq 'true'){
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
                         $line.=" checked ";
@@ -246,7 +227,7 @@ sub display_directory {
 		    $line.=' /></td>';
                 } else {
                     if (exists $locked_files{$fullpath}) {
-                        $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';
+                        $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';
 			$css_class= 'LC_browser_file_locked';
                     } else {
                         if (!$can_modify) {
@@ -260,68 +241,64 @@ sub display_directory {
                         if ($can_modify) {
                             my $cat='<img alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
-                            $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
+                            $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a>';
                             $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }
+		    $r->print('<tr class="'.$css_class.'">');
+		    $r->print($line);
                 }
-		$r->print('<tr class="'.$css_class.'">');
-		$r->print($line);
-		my $curr_access;
-		if ($select_mode ne 'true') {
-		    my $pub_access = 0;
-		    my $guest_access = 0;
-		    my $cond_access = 0;
-		    foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
-			my ($num,$scope,$end,$start) = &unpack_acc_key($key);
-			if (($now > $start) && (!$end || $end > $now)) {
-			    if ($scope eq 'public')  {
-				$pub_access = 1;
-			    } elsif ($scope eq 'guest') {
-				$guest_access = 1;
-			    } else {
-				$cond_access = 1;
-			    }
-			}
-		    }
-		    if (!$pub_access && !$guest_access && !$cond_access) {
-			$curr_access = &mt('Private');
-		    } else {
-			my @allaccesses; 
-			if ($pub_access) {
-			    push(@allaccesses,&mt('Public'));
-			}
-			if ($guest_access) {
-			    push(@allaccesses,&mt('Passphrase-protected'));
-			}
-			if ($cond_access) {
-			    push(@allaccesses,&mt('Conditional'));
-			}
-			$curr_access = join('+ ',@allaccesses);
-		    }
-		}
-		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-		$r->print('<td><a href="'.$href_location.$filename.'">'.
-			  $filename.'</a></td>'); 
-		$r->print('<td>'.$size.'</td>');
-		$r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
-		if ($select_mode ne 'true') {
-		    $r->print('<td><span style="white-space: nowrap">'.
-			      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
-		    $r->print('<a href="'.$url.'?access='.$filename.
-			      '&amp;currentpath='.$current_path.&group_args().
-			      '">'.$access_admin_text.'</a></span></td>');
-		}
-		$r->print('</tr>'.$/);
+                my $curr_access;
+                my $pub_access = 0;
+                my $guest_access = 0;
+                my $cond_access = 0;
+                foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
+                    my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+                    if (($now > $start) && (!$end || $end > $now)) {
+                        if ($scope eq 'public')  {
+                            $pub_access = 1;
+                        } elsif ($scope eq 'guest') {
+                            $guest_access = 1;
+                        } else {
+                            $cond_access = 1;
+                        }
+                    }
+                }
+                if (!$pub_access && !$guest_access && !$cond_access) {
+                    $curr_access = &mt('Private');
+                } else {
+                    my @allaccesses; 
+                    if ($pub_access) {
+                        push(@allaccesses,&mt('Public'));
+                    }
+                    if ($guest_access) {
+                        push(@allaccesses,&mt('Passphrase-protected'));
+                    }
+                    if ($cond_access) {
+                        push(@allaccesses,&mt('Conditional'));
+                    }
+                    $curr_access = join('+ ',@allaccesses);
+                }
+                $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+                $r->print('<td><a href="'.$href_location.$filename.'">'.
+			    $filename.'</a></td>'); 
+                $r->print('<td>'.$size.'</td>');
+                $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+                $r->print('<td><span style="white-space: nowrap">'.
+                          &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
+                $r->print('<a href="'.$url.'?access='.$filename.
+                              '&amp;currentpath='.$current_path.$groupecho.
+                              '">'.$access_admin_text.'</a>');
+                $r->print('</span></td></tr>');
             }
         }
     }
     if ($select_mode eq 'true') {
         $r->print('</table>
-            <input type="hidden" name="continue" value="true" />
-            <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
-            <input type="hidden" name="mode" value="selectfile" />
+            <input type="hidden" name="continue" value="true">
+            <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">
+            <input type="hidden" name="mode" value="selectfile">
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />
@@ -355,7 +332,7 @@ sub open_form {
 }
 
 sub close_form {
-    my ($r,$url,$button_text)=@_;
+    my ($r,$url,$group,$button_text)=@_;
     if (!defined($button_text)) {
         $button_text = {
                          'continue' => &mt('Continue'),
@@ -363,12 +340,19 @@ sub close_form {
                        };
     }
     $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />');
-    $r->print(&group_form_data().'</p></form>');
+    if (defined($group)) {
+       $r->print("\n".'<input type="hidden" name="group" value="'.
+              $group.'" />');
+    }
+    $r->print('</p></form>');
     $r->print('<form action="'.$url.'" method="post">
                <p>
               <input type="hidden" name="currentpath" value="'.
-	      $env{'form.currentpath'}.'" />'.
-	      &group_form_data());
+	      $env{'form.currentpath'}.'" />');
+    if (defined($group)) {
+       $r->print("\n".'<input type="hidden" name="group" value="'.
+              $group.'" />');
+    }
     $r->print("\n".'   <input type="submit" value="'.$button_text->{'cancel'}.'" />
                </p></form>'); 
 }
@@ -395,47 +379,49 @@ sub display_file {
 }
 
 sub done {
-    my ($message,$url)=@_;
+    my ($message,$url,$group)=@_;
     unless (defined $message) {
         $message='Done';
     }
     my $result = '<h3><a href="'.$url.'?currentpath='.
 	         $env{'form.currentpath'}.
 	         '&fieldname='.$env{'form.fieldname'}.
-	         '&mode='.$env{'form.mode'}.
-		 &group_args();
+	         '&mode='.$env{'form.mode'};
+    if (defined($group)) {
+        $result .= '&group='.$group;
+    }
     $result .= '">'.&mt($message).'</a></h3>';
     return $result;
 }
 
 sub delete {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $file_name = &prepend_group($file_name);
+    $file_name = &prepend_group($file_name,$group);
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");
-        $r->print(&done('Back',$url));
+        $r->print(&done('Back',$url,$group));
     } else {
         if (scalar(@files)) {
             &open_form($r,$url);
             $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
-            &close_form($r,$url);
+            &close_form($r,$url,$group);
         } else {
             $r->print("No file was checked to delete.<br />");
-            $r->print(&done(undef,$url));
+            $r->print(&done(undef,$url,$group));
         }
     }
 } 
 
 sub delete_confirmed {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;
-    my ($uname,$udom) = &get_name_dom();
-    my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $env{'form.currentpath'}.
@@ -445,23 +431,23 @@ sub delete_confirmed {
 		  ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
         }
     }
-    $r->print(&done(undef,$url));
+    $r->print(&done(undef,$url,$group));
 }
 
 sub delete_dir {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     &open_form($r,$url);
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
-    &close_form($r,$url);
+    &close_form($r,$url,$group);
 } 
 
 sub delete_dir_confirmed {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash
-    my ($uname,$udom) = &get_name_dom();
-    my $namespace = &get_namespace();
-    my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom($group);
+    my $namespace = &get_namespace($group);
+    my $port_path = &get_port_path($group);
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $directory_name);
 					       
@@ -481,35 +467,35 @@ sub delete_dir_confirmed {
         }
         $env{'form.currentpath'} = $directory_name;
     }
-    $r->print(&done(undef,$url));
+    $r->print(&done(undef,$url,$group));
 }
 
 sub rename {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
-    my ($uname,$udom) = &get_name_dom();
-    $file_name = &prepend_group($file_name);
+    my ($uname,$udom) = &get_name_dom($group);
+    $file_name = &prepend_group($file_name,$group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be renamed.<br />");
-        $r->print(&done(undef,$url));
+        $r->print(&done(undef,$url,$group));
     } else {
         &open_form($r,$url);
         $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                    <input name="filenewname" type="input" size="50" />?</p>');
-        &close_form($r,$url);
+        &close_form($r,$url,$group);
     }
 }
 
 sub rename_confirmed {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
-    my ($uname,$udom) = &get_name_dom();
-    my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     if ($filenewname eq '') {
 	$r->print('<span class="LC_error">'.
 		  &mt("Error: no valid filename was provided to rename to.").
 		  '</span><br />');
-	$r->print(&done(undef,$url));
+	$r->print(&done(undef,$url,$group));
 	return;
     } 
     my $result=
@@ -527,21 +513,19 @@ sub rename_confirmed {
 		      '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
 		      '<strong>'.&display_file('',$filenewname).'</strong>'));
     }
-    $r->print(&done(undef,$url));
+    $r->print(&done(undef,$url,$group));
 }
 
 sub display_access {
-    my ($r,$url,$group,$can_setacl,$port_path) = @_;
-    my ($uname,$udom) = &get_name_dom();
+    my ($r,$url,$group,$can_setacl) = @_;
+    my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
-    $file_name = &prepend_group($file_name);
+    $file_name = &prepend_group($file_name,$group);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
-    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
-			    $port_path.$env{'form.currentpath'}.
-			    $env{'form.access'}).'</h3>';
+    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     my $info .= 
 	&mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').
 	'<br /><ul><li>'.
@@ -564,18 +548,19 @@ sub display_access {
                         'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),
                       };
-        &close_form($r,$url,$button_text);
+        &close_form($r,$url,$group,$button_text);
     } else {
         $r->print($header);
         if ($aclcount) {  
             $r->print($info);
         }
-        &view_access_settings($r,$url,$access_controls{$file_name},$aclcount);
+        &view_access_settings($r,$url,$group,$access_controls{$file_name},
+                              $aclcount);
     }
 }
 
 sub view_access_settings {
-    my ($r,$url,$access_controls,$aclcount) = @_;
+    my ($r,$url,$group,$access_controls,$aclcount) = @_;
     my ($showstart,$showend);
     my %todisplay;
     foreach my $key (sort(keys(%{$access_controls}))) {
@@ -596,8 +581,12 @@ sub view_access_settings {
     } else {
         $r->print(&mt('No access control settings currently exist for this file.<br />' ));
     }
+    my $group_arg;
+    if ($group) {
+        $group_arg = '&amp;group='.$group;
+    }
     $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
-              &group_args().'">'.&mt('Return to directory listing').'</a>');
+              $group_arg.'">'.&mt('Return to directory listing').'</a>');
     return;
 }
 
@@ -705,7 +694,7 @@ sub build_access_summary {
 
 
 sub update_access {
-    my ($r,$url,$group,$port_path) = @_;
+    my ($r,$url,$group) = @_;
     my $totalprocessed = 0;
     my %processing;
     my %title  = (
@@ -731,9 +720,9 @@ sub update_access {
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
-              $port_path.$file_name).'</h3>'."\n");
-    $file_name = &prepend_group($file_name);
-    my ($uname,$udom) = &get_name_dom();
+              $file_name).'</h3>'."\n");
+    $file_name = &prepend_group($file_name,$group);
+    my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
     if ($totalprocessed) {
         ($outcome,$deloutcome,$new_values,$translation) =
@@ -804,7 +793,7 @@ sub update_access {
     if ($allnew > 0) {
         my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.
-        &open_form($r,$url);
+        &open_form($r,$url,$group);
         foreach my $newitem ('course','group','domains','users') {
             if ($env{'form.new'.$newitem} > 0) {
                 $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
@@ -819,14 +808,15 @@ sub update_access {
                                     $access_controls{$file_name},$now,$then);
             }
         }
-        &close_form($r,$url);
+        &close_form($r,$url,$group);
     } else {
+        my $group_arg;
+        if ($group) {
+            $group_arg = '&amp;group='.$group;
+        }
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
-                  '&amp;currentpath='.$env{'form.currentpath'}.&group_args().'">'.
-                   &mt('Display all access settings for this file').'</a>'.
-                  '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.
-                  '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
-                  &group_args().'">'.&mt('Return to directory listing').'</a>');
+                  '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
+                   &mt('Display all access settings for this file').'</a>');
     }
     return;
 }
@@ -1395,7 +1385,7 @@ END_SCRIPT
 }
 
 sub select_files {
-    my ($r) = @_;
+    my ($r,$group) = @_;
     if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . . 
@@ -1423,7 +1413,11 @@ ENDSMP
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }
             }
-            opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
+            opener.document.forms.lonhomework.
+ENDSMP
+    $javascript .= $env{'form.fieldname'};
+    $javascript .= (<<ENDSMP);
+        .value=fileList;
             self.close();
         }
         </script>
@@ -1439,36 +1433,26 @@ ENDSMP
 	}
     }
 }
-
 sub upload {
     my ($r,$url,$group)=@_;
     my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k
-    if (defined($group)) {
-        my $grp_quota = &get_group_quota($group); # quota expressed in k 
-        if ($grp_quota ne '') {
-            $disk_quota = $grp_quota;
-        } else {
-            $disk_quota = 0;
-        }
-    }
     $fname=&Apache::lonnet::clean_filename($fname);
 
-    my $portfolio_root=&get_portfolio_root();
-    my ($uname,$udom) = &get_name_dom();
-    my $port_path = &get_port_path();
+    my $portfolio_root=&get_portfolio_root($group);
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&get_dir_list($portfolio_root);
+    my @dir_list=&get_dir_list($portfolio_root,$group);
     my $found_file = 0;
     my $locked_file = 0;
     foreach my $line (@dir_list) {
         my ($file_name)=split(/\&/,$line,2);
         if ($file_name eq $fname){
             $file_name = $env{'form.currentpath'}.$file_name;
-            $file_name = &prepend_group($file_name);
+            $file_name = &prepend_group($file_name,$group);
             $found_file = 1;
-	    # FIXME I think this is incorrect, prepend_group took care of this?
             if (defined($group)) {
                 $file_name = $group.'/'.$file_name;
             }
@@ -1481,17 +1465,17 @@ sub upload {
     if (($current_disk_usage + $filesize) > $disk_quota){
         $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
-        $r->print(&done('Back',$url));
+        $r->print(&done('Back',$url,$group));
     } 
     elsif ($found_file){
         if ($locked_file){
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
-            $r->print(&done('Back',$url));      
+            $r->print(&done('Back',$url,$group));      
         } else {   
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
-            $r->print(&done('Back',$url));
+            $r->print(&done('Back',$url,$group));
         }
     } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',
@@ -1499,20 +1483,19 @@ sub upload {
         if ($result !~ m|^/uploaded/|) {
             $r->print('<span class="LC_error">'.'An errror occured ('.$result.
 	              ') while trying to upload '.&display_file().'</span><br />');
-	    $r->print(&done('Back',$url));
+	    $r->print(&done('Back',$url,$group));
         } else {
-            $r->print(&done(undef,$url));
+            $r->print(&done(undef,$url,$group));
         }
     }
 }
-
 sub lock_info {
     my ($r,$url,$group) = @_;
-    my ($uname,$udom) = &get_name_dom();
+    my ($uname,$udom) = &get_name_dom($group);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                        $uname);
     my $file_name = $env{'form.lockinfo'};
-    $file_name = &prepend_group($file_name);
+    $file_name = &prepend_group($file_name,$group);
     if (defined($file_name) && defined($$current_permissions{$file_name})) {
         foreach my $array_item (@{$$current_permissions{$file_name}}) {
             if (ref($array_item) eq 'ARRAY') {
@@ -1535,22 +1518,21 @@ sub lock_info {
             }
         }
     }
-    $r->print(&done('Back',$url));
+    $r->print(&done('Back',$url,$group));
     return 'ok';
 }
-
 sub createdir {
-    my ($r,$url)=@_;
+    my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {
     	$r->print('<span class="LC_error">'.
 	    	  &mt("Error: no directory name was provided.").
 		      '</span><br />');
-	    $r->print(&done(undef,$url));
+	    $r->print(&done(undef,$url,$group));
 	    return;
     }
-    my $portfolio_root = &get_portfolio_root(); 
-    my @dir_list=&get_dir_list($portfolio_root);
+    my $portfolio_root = &get_portfolio_root($group); 
+    my @dir_list=&get_dir_list($portfolio_root,$group);
     my $found_file = 0;
     foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);
@@ -1562,8 +1544,8 @@ sub createdir {
     	    $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.
     	            ' </strong>a file or directory by that name already exists.</span><br />');
     } else {
-        my ($uname,$udom) = &get_name_dom();
-        my $port_path = &get_port_path();
+        my ($uname,$udom) = &get_name_dom($group);
+        my $port_path = &get_port_path($group);
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
 	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
@@ -1574,47 +1556,32 @@ sub createdir {
     if ($newdir ne $env{'form.newdir'}) {
         $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
     }
-    $r->print(&done(undef,$url));
+    $r->print(&done(undef,$url,$group));
 }
 
 sub get_portfolio_root {
-    my ($uname,$udom) = &get_name_dom();
-    my $path;
-    if (defined($env{'form.group'})) {
-        $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
+    my ($group) = @_;
+    my ($portfolio_root,$udom,$uname,$path);
+    ($uname,$udom) = &get_name_dom($group);
+    if (defined($group)) {
+        $path = '/userfiles/groups/'.$group.'/portfolio';
     } else {
         $path = '/userfiles/portfolio';
     }
     return (&Apache::loncommon::propath($udom,$uname).$path);
 }
 
-sub get_group_quota {
-    my ($group) = @_;
-    my $group_quota; 
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
-    if (%curr_groups) {
-        my %group_info =  &Apache::longroup::get_group_settings(
-                                                    $curr_groups{$group});
-        $group_quota = $group_info{'quota'}; #expressed in Mb
-        if ($group_quota) {
-            $group_quota = 1000 * $group_quota; #expressed in k
-        } 
-    }
-    return $group_quota;
-} 
-
 sub get_dir_list {
-    my ($portfolio_root) = @_;
-    my ($uname,$udom) = &get_name_dom();
+    my ($portfolio_root,$group) = @_;
+    my ($uname,$udom) = &get_name_dom($group);
     return &Apache::lonnet::dirlist($env{'form.currentpath'},
                                           $udom,$uname,$portfolio_root);
 }
 
 sub get_name_dom {
+    my ($group) = @_;
     my ($uname,$udom);
-    if (defined($env{'form.group'})) {
+    if (defined($group)) {
         $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
     } else {
@@ -1625,26 +1592,28 @@ sub get_name_dom {
 }
 
 sub prepend_group {
-    my ($filename) = @_;
-    if (defined($env{'form.group'})) {
-        $filename = $env{'form.group'}.$filename;
+    my ($filename,$group) = @_;
+    if (defined($group)) {
+        $filename = $group.$filename;
     }
     return $filename;
 }
 
 sub get_namespace {
+    my ($group) = @_;
     my $namespace = 'portfolio';
-    if (defined($env{'form.group'})) {
-        my ($uname,$udom) = &get_name_dom();
-        $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
+    if (defined($group)) {
+        my ($uname,$udom) = &get_name_dom($group);
+        $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
     }
     return $namespace;
 }
 
 sub get_port_path {
+    my ($group) = @_;
     my $port_path;
-    if (defined($env{'form.group'})) {
-       $port_path = "groups/$env{'form.group'}/portfolio";
+    if (defined($group)) {
+       $port_path = "groups/$group/portfolio";
     } else {
        $port_path = 'portfolio';
     }
@@ -1652,7 +1621,7 @@ sub get_port_path {
 }
 
 sub missing_priv {
-    my ($r,$url,$priv) = @_;
+    my ($r,$url,$priv,$group) = @_;
     my $longtext = {
                       upload => 'upload files',
                       delete => 'delete files',
@@ -1670,9 +1639,9 @@ sub missing_priv {
     $r->print(&mt('<h3>Action disallowed</h3>'));
     $r->print(&mt('You do not have sufficient privileges to [_1] ',
                   $longtext->{$priv}));
-    if (defined($env{'form.group'})) {
+    if ($group) {
         $r->print(&mt("in the group's file repository."));
-        $rtnlink .= &group_args()
+        $rtnlink .= '&group='.$group;
     } else {
         $r->print(&mt('in this portfolio.'));
     }
@@ -1682,30 +1651,6 @@ sub missing_priv {
     return;
 }
 
-sub coursegrp_portfolio_header {
-    my ($cdom,$cnum,$grp_desc)=@_;
-    my $gpterm  = &Apache::loncommon::group_term();
-    my $ucgpterm = $gpterm;
-    $ucgpterm =~ s/^(\w)/uc($1)/e;
-    if ($env{'form.ref'}) {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"/adm/coursegroups",
-              text=>"Groups",
-              title=>"Course Groups"});
-    }
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
-          text=>"$ucgpterm: $grp_desc",
-          title=>"Go to group's home page"},
-         {href=>"/adm/coursegrp_portfolio?".&group_args(),
-          text=>"Group Portfolio",
-          title=>"Display group portfolio"});
-    my $output = &Apache::lonhtmlcommon::breadcrumbs(
-                         &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
-    return $output;
-}
-
-
 sub handler {
     # this handles file management
     my $r = shift;
@@ -1713,7 +1658,7 @@ sub handler {
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',
 	  'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles']);
-    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
+    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
         $caller = $2;
@@ -1728,21 +1673,18 @@ sub handler {
             return HTTP_NOT_ACCEPTABLE;
         }
         my $earlyout = 0;
-        my $view_permission = 
-           &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-        $env{'form.group'} =~ s/\W//g;
-	$group = $env{'form.group'};
+        my $view_permission = &Apache::lonnet::allowed('vcg',
+                                                $env{'request.course.id'});
+        $group = $env{'form.group'};
+        $group =~ s/\W//g;
         if ($group) {
-            ($uname,$udom) = &get_name_dom();
+            ($uname,$udom) = &get_name_dom($group);
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
 							       $group); 
             if (%curr_groups) {
-                my %grp_content = &Apache::longroup::get_group_settings(
-                                                         $curr_groups{$group});
-                $grp_desc = &unescape($grp_content{'description'});
                 if (($view_permission) || (&Apache::lonnet::allowed('rgf',
                                       $env{'request.course.id'}.'/'.$group))) {
-                    $portfolio_root = &get_portfolio_root();
+                    $portfolio_root = &get_portfolio_root($group);
                 } else {
                     $r->print('You do not have the privileges required to access the shared files space for this group.');
                     $earlyout = 1;
@@ -1757,24 +1699,17 @@ sub handler {
             $earlyout = 1;
         }
         if ($earlyout) { return OK; }
-        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
+            $can_setacl = 1;
+        }
+        if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
+            $can_upload = 1;
+        }
+        if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
             $can_modify = 1;
+        }
+        if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
             $can_delete = 1;
-            $can_upload = 1;
-            $can_setacl = 1;
-        } else {
-            if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
-                $can_setacl = 1;
-            }
-            if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
-                $can_upload = 1;
-            }
-            if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
-                $can_modify = 1;
-            }
-            if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
-                $can_delete = 1;
-            }
         }
     } else {
         ($uname,$udom) = &get_name_dom();
@@ -1786,7 +1721,6 @@ sub handler {
         $can_setacl = 1;
     }
 
-    my $port_path = &get_port_path();
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -1812,7 +1746,7 @@ sub handler {
         &open_form($r,$url);
 #        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
         $r->print('Edit the meta data<br />');
-        &close_form($r,$url);
+        &close_form($r,$url,$group);
     }
     if ($env{'form.store'}) {
     }
@@ -1821,67 +1755,67 @@ sub handler {
         if ($can_upload) {
 	    &upload($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'upload');
+            &missing_priv($r,$url,'upload',$group),
         }
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
         if ($can_delete) {
-	    &delete_confirmed($r,$url);
+	    &delete_confirmed($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'delete');
+            &missing_priv($r,$url,'delete',$group);
         }
     } elsif ($env{'form.action'} eq 'delete') {
         if ($can_delete) {
-	    &delete($r,$url);
+	    &delete($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'delete');
+            &missing_priv($r,$url,'delete',$group);
         }
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
         if ($can_delete) {
-	    &delete_dir_confirmed($r,$url);
+	    &delete_dir_confirmed($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'delete');
+            &missing_priv($r,$url,'delete',$group);
         }
     } elsif ($env{'form.action'} eq 'deletedir') {
         if ($can_delete) {
-	    &delete_dir($r,$url);
+	    &delete_dir($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'delete');
+            &missing_priv($r,$url,'delete',$group);
         }
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
         if ($can_modify) {
-	    &rename_confirmed($r,$url);
+	    &rename_confirmed($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'rename');
+            &missing_priv($r,$url,'rename',$group);
         }
     } elsif ($env{'form.rename'}) {
         $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';
         if ($can_modify) {
-	    &rename($r,$url);
+	    &rename($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'rename');
+            &missing_priv($r,$url,'rename',$group);
         }
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';
-        &display_access($r,$url,$group,$can_setacl,$port_path);
+        &display_access($r,$url,$group,$can_setacl);
     } elsif ($env{'form.action'} eq 'chgaccess') {
         if ($can_setacl) {
-            &update_access($r,$url,$group,$port_path);
+            &update_access($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'setacl');
+            &missing_priv($r,$url,'setacl',$group);
         }
     } elsif ($env{'form.action'} eq 'rolepicker') {
         if ($can_setacl) { 
             &role_options_window($r);
         } else {
-            &missing_priv($r,$url,'setacl');
+            &missing_priv($r,$url,'setacl',$group);
         }
     } elsif ($env{'form.createdir'}) {
         if ($can_upload) {
-	    &createdir($r,$url);
+	    &createdir($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'upload');
+            &missing_priv($r,$url,'upload',$group);
         }
     } elsif ($env{'form.lockinfo'}) {
         &lock_info($r,$url,$group);
@@ -1890,18 +1824,14 @@ sub handler {
 	if ($env{'form.currentpath'}) {
 	    $current_path = $env{'form.currentpath'};
 	}
-        if ($caller eq 'coursegrp_portfolio') {
-            &Apache::lonhtmlcommon::clear_breadcrumbs();
-            $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
-        }
-        my @dir_list=&get_dir_list($portfolio_root);
+        my @dir_list=&get_dir_list($portfolio_root,$group);
 	if ($dir_list[0] eq 'no_such_dir'){
 	    # two main reasons for this:
             #    1) never been here, so directory structure not created
 	    #    2) back-button navigation after deleting a directory
 	    if ($current_path eq '/'){
 	        &Apache::lonnet::mkdiruserfile($uname,$udom,
-					       &get_port_path());
+					       &get_port_path($group));
 	    } else {
                 # some directory that snuck in get rid of the directory
                 # from the recent pulldown, just in case
@@ -1915,8 +1845,8 @@ sub handler {
         }
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
-	&display_common($r,$url,$current_path,$is_empty,\@dir_list,
-			$can_upload);
+	&display_common($r,$url,$current_path,$is_empty,\@dir_list,$group,
+                        $can_upload);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);
 	$r->print(&Apache::loncommon::end_page());