--- loncom/interface/portfolio.pm	2006/07/19 14:57:18	1.137
+++ loncom/interface/portfolio.pm	2006/08/04 22:22:32	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.137 2006/07/19 14:57:18 albertel Exp $
+# $Id: portfolio.pm,v 1.146 2006/08/04 22:22:32 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,7 @@ use LONCAPA;
 sub group_args {
     my $output;
     if (defined($env{'form.group'})) {
-        $ouput .= '&group='.$env{'form.group'};
+        $output .= '&group='.$env{'form.group'};
 	if (defined($env{'form.ref'})) {
 	    $output .= '&ref='.$env{'form.ref'};
 	}
@@ -54,12 +54,13 @@ sub group_args {
 sub group_form_data {
     my $output;
     if (defined($env{'form.group'})) {
-	$ouput = '<input type="hidden" name="group" value="'.$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/
@@ -69,15 +70,16 @@ sub make_anchor {
         $continue_select) = @_;
     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()
+    $anchor .= &group_args();
     $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($group);
-    my $port_path = &get_port_path($group);
+    my $namespace = &get_namespace();
+    my $port_path = &get_port_path();
     if ($can_upload) {
         my $groupitem = &group_form_data();
 
@@ -147,12 +149,12 @@ TABLE
 sub display_directory_line {
     my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
 	$line, $access_controls, $curr_access, $now, $version_flag,
-	$href_location, $url, $current_path, $access_admin_text)=@_;
+	$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
     # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $r->print('<tr class="'.$css_class.'">');
     $r->print($line);
     $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-    $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
+    $r->print('<td>'.$$version_flag{$filename}.'</td><td><a href="'.$href_location.$filename.'">'.
 	      $filename.'</a></td>'); 
     $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
@@ -167,14 +169,14 @@ sub display_directory_line {
 }
 
 sub display_directory {
-    my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,
+    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 $display_out;
     my $select_mode;
     my $checked_files;
-    my $port_path = &get_port_path($group);
-    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path();
+    my ($uname,$udom) = &get_name_dom();
     my $access_admin_text = &mt('View Status');
     if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');
@@ -206,11 +208,11 @@ sub display_directory {
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.
-            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+            '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {
         $r->print('<form method="post" action="'.$url.'">');
         $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>');
+            '<tr><th colspan="2">Actions</th><th>&nbsp;</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");
 
@@ -219,7 +221,7 @@ sub display_directory {
     my @dir_lines;
     my @version_lines;
     my %versioned;
-    foreach my $line (sort 
+    foreach my $dir_line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
 			  my ($bfile)=split('&',$b,2);
@@ -227,7 +229,7 @@ sub display_directory {
 		      } (@$dir_list)) {
     	#$strip holds directory/file name
     	#$dom 
-    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     	$filename =~ s/\s+$//;
     	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if ($version) {
@@ -237,8 +239,8 @@ sub display_directory {
     	    push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     	}
     }
-    foreach my $line (@dir_lines) {
-        my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
+    foreach my $dir_line (@dir_lines) {
+        my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
     	    my %version_flag;
@@ -248,12 +250,12 @@ sub display_directory {
     	    }
     	    if (exists($versioned{$filename})) {
     	        if ($show_versions) {
-                    $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+                    $version_flag{$filename} = '<a href="portfolio"><img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
     	        } else {
-                    $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+                    $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
                 }
     	    } else {
-    	        $version_flag{$filename} = '';
+    	        $version_flag{$filename} = '&nbsp;';
     	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
@@ -262,13 +264,13 @@ 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>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/</td>'); 
+                $r->print('<td>'.$version_flag{$filename}.'</td><td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
 		my $line;
                 my $fullpath = $current_path.$filename;
-                $fullpath = &prepend_group($fullpath,$group);
+                $fullpath = &prepend_group($fullpath);
                 if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
@@ -289,10 +291,10 @@ sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }
                         if ($can_modify) {
-                            my $cat='<img alt="'.&mt('Catalog Information').
+                            my $cat='<img class="LC_icon" 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 .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+                            $line .= '</td><td>'.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }
@@ -330,27 +332,20 @@ sub display_directory {
 			$curr_access = join('+ ',@allaccesses);
 		    }
 		}
-                &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,
-                        $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
-#		$r->print('<tr class="'.$css_class.'">');
-#		$r->print($line);
-#		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-#		$r->print('<td>'.$version_flag{$filename}.'<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>'.$/);
+                &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, 
+                                        \%access_controls, $curr_access,$now, \%version_flag, $href_location, 
+                                        $url, $current_path, $access_admin_text);
 		if ($show_versions) {
-		    &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, 
-                        $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
-
+		    foreach my $dir_line (@version_lines) {
+		        my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
+                        my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+                        $line = '<td colspan="2">&nbsp;</td>';
+                        if (($v_fname eq $fname)&&($v_extension eq $extension)) {
+		            &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, 
+		                            $css_class, $line, \%access_controls, $curr_access, $now,
+		                             \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
+		        }
+		    }
 		}
             }
         }
@@ -400,7 +395,7 @@ sub close_form {
                          'cancel'   => &mt('Cancel'),
                        };
     }
-    $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />')
+    $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />');
     $r->print(&group_form_data().'</p></form>');
     $r->print('<form action="'.$url.'" method="post">
                <p>
@@ -447,12 +442,12 @@ sub done {
 }
 
 sub delete {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $file_name = &prepend_group($file_name,$group);
+    $file_name = &prepend_group($file_name);
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
-    my ($uname,$udom) = &get_name_dom($group);
+    my ($uname,$udom) = &get_name_dom();
     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));
@@ -469,11 +464,11 @@ sub delete {
 } 
 
 sub delete_confirmed {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;
-    my ($uname,$udom) = &get_name_dom($group);
-    my $port_path = &get_port_path($group);
+    my ($uname,$udom) = &get_name_dom();
+    my $port_path = &get_port_path();
     foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $env{'form.currentpath'}.
@@ -494,12 +489,12 @@ sub delete_dir {
 } 
 
 sub delete_dir_confirmed {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash
-    my ($uname,$udom) = &get_name_dom($group);
-    my $namespace = &get_namespace($group);
-    my $port_path = &get_port_path($group);
+    my ($uname,$udom) = &get_name_dom();
+    my $namespace = &get_namespace();
+    my $port_path = &get_port_path();
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $directory_name);
 					       
@@ -523,10 +518,10 @@ sub delete_dir_confirmed {
 }
 
 sub rename {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
-    my ($uname,$udom) = &get_name_dom($group);
-    $file_name = &prepend_group($file_name,$group);
+    my ($uname,$udom) = &get_name_dom();
+    $file_name = &prepend_group($file_name);
     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));
@@ -539,10 +534,10 @@ sub rename {
 }
 
 sub rename_confirmed {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
-    my ($uname,$udom) = &get_name_dom($group);
-    my $port_path = &get_port_path($group);
+    my ($uname,$udom) = &get_name_dom();
+    my $port_path = &get_port_path();
     if ($filenewname eq '') {
 	$r->print('<span class="LC_error">'.
 		  &mt("Error: no valid filename was provided to rename to.").
@@ -570,15 +565,20 @@ sub rename_confirmed {
 
 sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;
-    my ($uname,$udom) = &get_name_dom($group);
+    my ($uname,$udom) = &get_name_dom();
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
-    $file_name = &prepend_group($file_name,$group);
+    $file_name = &prepend_group($file_name);
     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 file: [_1]',$port_path.$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>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+
+    if ($group eq '') {
+        $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));
+    }
+    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -753,10 +753,10 @@ sub update_access {
         }
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
+    $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");
-    $file_name = &prepend_group($file_name,$group);
-    my ($uname,$udom) = &get_name_dom($group);
+    $file_name = &prepend_group($file_name);
+    my ($uname,$udom) = &get_name_dom();
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
     if ($totalprocessed) {
         ($outcome,$deloutcome,$new_values,$translation) =
@@ -827,7 +827,7 @@ sub update_access {
     if ($allnew > 0) {
         my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.
-        &open_form($r,$url,$group);
+        &open_form($r,$url);
         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 />');
@@ -845,7 +845,7 @@ sub update_access {
         &close_form($r,$url);
     } else {
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
-                  '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
+                  '&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'}.
@@ -1417,7 +1417,7 @@ END_SCRIPT
 }
 
 sub select_files {
-    my ($r,$group) = @_;
+    my ($r) = @_;
     if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . . 
@@ -1461,6 +1461,7 @@ ENDSMP
 	}
     }
 }
+
 sub upload {
     my ($r,$url,$group)=@_;
     my $fname=$env{'form.uploaddoc.filename'};
@@ -1476,22 +1477,19 @@ sub upload {
     }
     $fname=&Apache::lonnet::clean_filename($fname);
 
-    my $portfolio_root=&get_portfolio_root($group);
-    my ($uname,$udom) = &get_name_dom($group);
-    my $port_path = &get_port_path($group);
+    my $portfolio_root=&get_portfolio_root();
+    my ($uname,$udom) = &get_name_dom();
+    my $port_path = &get_port_path();
     # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&get_dir_list($portfolio_root,$group);
+    my @dir_list=&get_dir_list($portfolio_root);
     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,$group);
+            $file_name = &prepend_group($file_name);
             $found_file = 1;
-            if (defined($group)) {
-                $file_name = $group.'/'.$file_name;
-            }
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;
             } 
@@ -1528,11 +1526,11 @@ sub upload {
 
 sub lock_info {
     my ($r,$url,$group) = @_;
-    my ($uname,$udom) = &get_name_dom($group);
+    my ($uname,$udom) = &get_name_dom();
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                        $uname);
     my $file_name = $env{'form.lockinfo'};
-    $file_name = &prepend_group($file_name,$group);
+    $file_name = &prepend_group($file_name);
     if (defined($file_name) && defined($$current_permissions{$file_name})) {
         foreach my $array_item (@{$$current_permissions{$file_name}}) {
             if (ref($array_item) eq 'ARRAY') {
@@ -1558,18 +1556,19 @@ sub lock_info {
     $r->print(&done('Back',$url));
     return 'ok';
 }
+
 sub createdir {
-    my ($r,$url,$group)=@_;
+    my ($r,$url)=@_;
     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,$group));
+	    $r->print(&done(undef,$url));
 	    return;
     }
-    my $portfolio_root = &get_portfolio_root($group); 
-    my @dir_list=&get_dir_list($portfolio_root,$group);
+    my $portfolio_root = &get_portfolio_root(); 
+    my @dir_list=&get_dir_list($portfolio_root);
     my $found_file = 0;
     foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);
@@ -1581,8 +1580,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($group);
-        my $port_path = &get_port_path($group);
+        my ($uname,$udom) = &get_name_dom();
+        my $port_path = &get_port_path();
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
 	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
@@ -1597,11 +1596,10 @@ sub createdir {
 }
 
 sub get_portfolio_root {
-    my ($group) = @_;
-    my ($uname,$udom) = &get_name_dom($group);
+    my ($uname,$udom) = &get_name_dom();
     my $path;
-    if (defined($group)) {
-        $path = '/userfiles/groups/'.$group.'/portfolio';
+    if (defined($env{'form.group'})) {
+        $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
     } else {
         $path = '/userfiles/portfolio';
     }
@@ -1626,16 +1624,15 @@ sub get_group_quota {
 } 
 
 sub get_dir_list {
-    my ($portfolio_root,$group) = @_;
-    my ($uname,$udom) = &get_name_dom($group);
+    my ($portfolio_root) = @_;
+    my ($uname,$udom) = &get_name_dom();
     return &Apache::lonnet::dirlist($env{'form.currentpath'},
                                           $udom,$uname,$portfolio_root);
 }
 
 sub get_name_dom {
-    my ($group) = @_;
     my ($uname,$udom);
-    if (defined($group)) {
+    if (defined($env{'form.group'})) {
         $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
     } else {
@@ -1646,28 +1643,26 @@ sub get_name_dom {
 }
 
 sub prepend_group {
-    my ($filename,$group) = @_;
-    if (defined($group)) {
-        $filename = $group.$filename;
+    my ($filename) = @_;
+    if (defined($env{'form.group'})) {
+        $filename = $env{'form.group'}.$filename;
     }
     return $filename;
 }
 
 sub get_namespace {
-    my ($group) = @_;
     my $namespace = 'portfolio';
-    if (defined($group)) {
-        my ($uname,$udom) = &get_name_dom($group);
-        $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+    if (defined($env{'form.group'})) {
+        my ($uname,$udom) = &get_name_dom();
+        $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
     }
     return $namespace;
 }
 
 sub get_port_path {
-    my ($group) = @_;
     my $port_path;
-    if (defined($group)) {
-       $port_path = "groups/$group/portfolio";
+    if (defined($env{'form.group'})) {
+       $port_path = "groups/$env{'form.group'}/portfolio";
     } else {
        $port_path = 'portfolio';
     }
@@ -1675,7 +1670,7 @@ sub get_port_path {
 }
 
 sub missing_priv {
-    my ($r,$url,$priv,$group) = @_;
+    my ($r,$url,$priv) = @_;
     my $longtext = {
                       upload => 'upload files',
                       delete => 'delete files',
@@ -1693,7 +1688,7 @@ sub missing_priv {
     $r->print(&mt('<h3>Action disallowed</h3>'));
     $r->print(&mt('You do not have sufficient privileges to [_1] ',
                   $longtext->{$priv}));
-    if ($group) {
+    if (defined($env{'form.group'})) {
         $r->print(&mt("in the group's file repository."));
         $rtnlink .= &group_args()
     } else {
@@ -1717,7 +1712,7 @@ sub coursegrp_portfolio_header {
               title=>"Course Groups"});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/$cdom/$cnum/$group/smppg?ref=$env{'form.ref'}",
+        ({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(),
@@ -1736,7 +1731,7 @@ sub handler {
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',
 	  'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles','showversions','ref']);
-    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
+    my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
         $caller = $2;
@@ -1754,9 +1749,9 @@ sub handler {
         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;
-	my $group = $env{'form.group'};
+	$group = $env{'form.group'};
         if ($group) {
-            ($uname,$udom) = &get_name_dom($group);
+            ($uname,$udom) = &get_name_dom();
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
 							       $group); 
             if (%curr_groups) {
@@ -1765,7 +1760,7 @@ sub handler {
                 $grp_desc = &unescape($grp_content{'description'});
                 if (($view_permission) || (&Apache::lonnet::allowed('rgf',
                                       $env{'request.course.id'}.'/'.$group))) {
-                    $portfolio_root = &get_portfolio_root($group);
+                    $portfolio_root = &get_portfolio_root();
                 } else {
                     $r->print('You do not have the privileges required to access the shared files space for this group.');
                     $earlyout = 1;
@@ -1809,7 +1804,7 @@ sub handler {
         $can_setacl = 1;
     }
 
-    my $port_path = &get_port_path($group);
+    my $port_path = &get_port_path();
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -1844,45 +1839,45 @@ sub handler {
         if ($can_upload) {
 	    &upload($r,$url,$group);
         } else {
-            &missing_priv($r,$url,'upload',$group,$refarg),
+            &missing_priv($r,$url,'upload');
         }
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
         if ($can_delete) {
-	    &delete_confirmed($r,$url,$group);
+	    &delete_confirmed($r,$url);
         } else {
-            &missing_priv($r,$url,'delete',$group);
+            &missing_priv($r,$url,'delete');
         }
     } elsif ($env{'form.action'} eq 'delete') {
         if ($can_delete) {
-	    &delete($r,$url,$group,$refarg);
+	    &delete($r,$url);
         } else {
-            &missing_priv($r,$url,'delete',$group);
+            &missing_priv($r,$url,'delete');
         }
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
         if ($can_delete) {
-	    &delete_dir_confirmed($r,$url,$group);
+	    &delete_dir_confirmed($r,$url);
         } else {
-            &missing_priv($r,$url,'delete',$group);
+            &missing_priv($r,$url,'delete');
         }
     } elsif ($env{'form.action'} eq 'deletedir') {
         if ($can_delete) {
 	    &delete_dir($r,$url);
         } else {
-            &missing_priv($r,$url,'delete',$group);
+            &missing_priv($r,$url,'delete');
         }
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
         if ($can_modify) {
-	    &rename_confirmed($r,$url,$group);
+	    &rename_confirmed($r,$url);
         } else {
-            &missing_priv($r,$url,'rename',$group);
+            &missing_priv($r,$url,'rename');
         }
     } elsif ($env{'form.rename'}) {
         $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';
         if ($can_modify) {
-	    &rename($r,$url,$group);
+	    &rename($r,$url);
         } else {
-            &missing_priv($r,$url,'rename',$group);
+            &missing_priv($r,$url,'rename');
         }
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
@@ -1892,19 +1887,19 @@ sub handler {
         if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);
         } else {
-            &missing_priv($r,$url,'setacl',$group);
+            &missing_priv($r,$url,'setacl');
         }
     } elsif ($env{'form.action'} eq 'rolepicker') {
         if ($can_setacl) { 
             &role_options_window($r);
         } else {
-            &missing_priv($r,$url,'setacl',$group);
+            &missing_priv($r,$url,'setacl');
         }
     } elsif ($env{'form.createdir'}) {
         if ($can_upload) {
-	    &createdir($r,$url,$group);
+	    &createdir($r,$url);
         } else {
-            &missing_priv($r,$url,'upload',$group);
+            &missing_priv($r,$url,'upload');
         }
     } elsif ($env{'form.lockinfo'}) {
         &lock_info($r,$url,$group);
@@ -1917,14 +1912,14 @@ sub handler {
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
         }
-        my @dir_list=&get_dir_list($portfolio_root,$group);
+        my @dir_list=&get_dir_list($portfolio_root);
 	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($group));
+					       &get_port_path());
 	    } else {
                 # some directory that snuck in get rid of the directory
                 # from the recent pulldown, just in case
@@ -1940,7 +1935,7 @@ sub handler {
 	my $is_empty=(@dir_list == 2);
 	&display_common($r,$url,$current_path,$is_empty,\@dir_list,
 			$can_upload);
-        &display_directory($r,$url,$current_path,$is_empty,\@dir_list,
+        &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());
     }