--- loncom/interface/portfolio.pm	2006/07/19 15:31:05	1.138
+++ loncom/interface/portfolio.pm	2006/10/19 21:23:22	1.166
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.138 2006/07/19 15:31:05 albertel Exp $
+# $Id: portfolio.pm,v 1.166 2006/10/19 21:23:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,17 +60,21 @@ sub group_form_data {
 		$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) = @_;
-    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;
+    my ($url, $anchor_fields, $inner_text) = @_;
+    if ($$anchor_fields{'continue'} ne 'true') {$$anchor_fields{'continue'} = 'false'};
+    my $anchor = '<a href="'.$url.'?';
+    foreach my $field_name (keys(%$anchor_fields)) {
+        $anchor .= $field_name.'='.$$anchor_fields{$field_name}.'&amp;';
+    }
+    $anchor =~ s/&amp;$//;
     $anchor .= &group_args();
-    $anchor .= '">'.$filename.'</a>';
+    $anchor .= '">'.$inner_text.'</a>';
     return $anchor;
 }
 
@@ -128,12 +132,26 @@ 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"}).'/');
+    my %anchor_fields = (
+        'selectfile'    => $port_path,
+        'currentpath'   => '/',
+        'mode'          => $env{"form.mode"},
+        'fieldname'     => $env{"form.fieldname"},
+        'continue'      => $env{"form.continue"}
+    );
+    $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     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"}).'/');
+            my %anchor_fields = (
+                'selectfile' => $tree[$i],
+                'currentpath' => '/',
+                'mode' => $env{"form.mode"},
+                'fieldname' => $env{"form.fieldname"},
+                'continue' => $env{"form.continue"}
+            );
+            $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/');
         }
     }
     $r->print('</span>');
@@ -146,23 +164,54 @@ TABLE
 }
 
 sub display_directory_line {
-    my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
+    my ($r,$select_mode, $filename, $mtime, $size, $css_class,
 	$line, $access_controls, $curr_access, $now, $version_flag,
-	$href_location, $url, $current_path, $access_admin_text)=@_;
-    # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+	$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
+
+    my $fullpath =  &prepend_group($current_path.$filename);
     $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($line); # contains first two cells of table
+    my $lock_info;
+    if ($version_flag) { # versioned can't be versioned, so TRUE when root file
+        $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+        $r->print('<td>'.$version_flag.'</td>');
+    } else { # this is a graded or handed back file
+        my ($user,$domain) = &get_name_dom();
+        my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
+        if (defined($$permissions_hash{$fullpath})) {
+            foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
+                if (ref($array_item) eq 'ARRAY') {
+                    if ($$array_item[-1] eq 'handback') {
+                        $lock_info = 'Handback';
+                    } elsif ($$array_item[-1] eq 'graded') {
+                        $lock_info = 'Graded';
+                    }
+                 }
+            }
+        }
+	if ($lock_info) {
+	    my %anchor_fields = ('lockinfo' => $fullpath);
+	    if ($versions) { # hold the folder open
+	        my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+	        $fname =~ s|^/||;
+	        $anchor_fields{'showversions'} = $fname.'.'.$extension;
+	    }
+	    $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
+	}
+	$r->print('<td colspan="2">'.$lock_info.'</td>');
+    }
+    # $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
+    $r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</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>');
+        my %anchor_fields = (
+            'access' => $filename,
+            'currentpath' => $current_path
+        );
+	$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
     }
     $r->print('</tr>'.$/);
 }
@@ -207,20 +256,19 @@ 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");
 
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     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);
@@ -228,33 +276,48 @@ 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) {
-    	    push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
-    	    $versioned{$fname.'.'.$extension} .= $version.",";
+	    my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
+    	    push(@{ $versioned{$fullpath} },
+		 [$filename,$dom,$testdir,$size,$mtime,$obs,]);
     	} else {
     	    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;
+    	    my $version_flag;
     	    my $show_versions;
-    	    if ($env{'form.showversions'} eq $filename) {
+	    my $fullpath =  &prepend_group($current_path.$filename);
+    	    if ($env{'form.showversions'} =~ /$filename/) {
     	        $show_versions = 'true';
     	    }
-    	    if (exists($versioned{$filename})) {
+    	    if (exists($versioned{$fullpath})) {
+    	        my %anchor_fields = (
+    	            'selectfile' => $fullpath,
+    	            'continue' => 'false',
+    	            'currentpath' => $current_path,
+    	        );
     	        if ($show_versions) {
-                    $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+    	            # Must preserve other possible showversion files
+    	            my $version_remainder = $env{'form.showversions'};
+    	            $version_remainder =~ s/$filename//g;    	            
+    	            $anchor_fields{'showversions'} = $version_remainder;
+                    $version_flag = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
     	        } else {
-                    $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+    	            # allow multiple files to show versioned
+    	            $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename;
+                    $version_flag = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }
     	    } else {
-    	        $version_flag{$filename} = '';
+    	        $version_flag = '&nbsp;';
     	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
@@ -263,13 +326,18 @@ 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>'); 
+                my %anchor_fields = (
+                    'selectfile'    => $filename.'/',
+                    'currentpath'   => $current_path.$filename.'/',
+                    'mode'          => $env{"form.mode"},
+                    'fieldname'     => $env{"form.fieldname"},
+                    'continue'      => $env{"form.continue"}
+                );  
+                $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
 		my $line;
-                my $fullpath = $current_path.$filename;
-                $fullpath = &prepend_group($fullpath);
                 if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
@@ -278,7 +346,10 @@ 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>';
+                        my %anchor_fields = (
+                            'lockinfo' => $fullpath
+                        );
+                        $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
 			$css_class= 'LC_browser_file_locked';
                     } else {
                         if (!$can_modify) {
@@ -290,10 +361,15 @@ 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>';
+                            my %anchor_fields = (
+                                'rename' => $filename,
+                                currentpath => $current_path
+                            );
+                            $line .= &make_anchor($url,\%anchor_fields,'Rename');
+                            $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
+                            # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }
@@ -331,27 +407,18 @@ 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, $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 (@{ $versioned{$fullpath} }) {
+		        my ($v_filename,$dom,$testdir,$size,$mtime,$obs) =
+			    @$dir_line;
+                        $line = '<td colspan="2">&nbsp;</td>';
+			&display_directory_line($r,$select_mode, $v_filename, $mtime, $size, 
+						$css_class, $line, \%access_controls, $curr_access, $now,
+						undef, $href_location, $url, $current_path, $access_admin_text, 1);
+		    }
 		}
             }
         }
@@ -438,12 +505,13 @@ sub done {
     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();
-    $result .= '">'.&mt($message).'</a></h3>';
+    my %anchor_fields = (
+        'showversions' => $env{'form.showversions'},
+        'currentpath' => $env{'form.currentpath'},
+        'fieldname' => $env{'form.fieldname'},
+        'mode'      => $env{'form.mode'}
+    );
+    my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
     return $result;
 }
 
@@ -470,18 +538,55 @@ sub delete {
 } 
 
 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 $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+                                                                        $uname);
     foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $env{'form.currentpath'}.
 					       $delete_file);
         if ($result ne 'ok') {
-	$r->print('<span class="LC_error"> An error occured ('.$result.
-		  ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
+	    $r->print('<span class="LC_error">'.
+                     &mt('An error occured ([_1]) while trying to delete 
+                         [_2].',$result,&display_file(undef, $delete_file)).
+                      '</span><br /><br />');
+        } else {
+            $r->print(&mt('File: [_1] deleted.',
+                          &display_file(undef,$delete_file)));
+            my $file_name = $env{'form.currentpath'}.$delete_file;
+            $file_name = &prepend_group($file_name);
+            my %access_controls = 
+                    &Apache::lonnet::get_access_controls($current_permissions,
+                                                         $group,$file_name);
+            if (keys(%access_controls) > 0) {
+                my %changes; 
+                foreach my $key (keys(%{$access_controls{$file_name}})) {
+                    $changes{'delete'}{$key} = 1;
+                }
+                if (keys(%changes) > 0) {
+                    my ($outcome,$deloutcome,$new_values,$translation) =
+                    &Apache::lonnet::modify_access_controls($file_name,\%changes,
+                                                            $udom,$uname);
+                    if ($outcome ne 'ok') {
+                           $r->print('<br />'.&mt("An error occured ([_1]) while ".
+                               "trying to delete access controls for the file.",$outcome).
+                               '</span><br /><br />');
+                    } else {
+                        if ($deloutcome eq 'ok') {
+                            $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
+                        } else {
+                            $r->print('<span class="LC_error">'.'<br />'.
+                               &mt("An error occured ([_1]) while ".
+                                   "trying to delete access controls for the file.",$deloutcome).
+                                   '</span><br /><br />');
+                        }
+                    }
+                }
+            }
         }
     }
     $r->print(&done(undef,$url));
@@ -540,7 +645,7 @@ sub rename {
 }
 
 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();
@@ -551,24 +656,79 @@ sub rename_confirmed {
 	$r->print(&done(undef,$url));
 	return;
     } 
+    my $chg_access;
     my $result=
 	&Apache::lonnet::renameuserfile($uname,$udom,
             $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             $port_path.$env{'form.currentpath'}.$filenewname);
-    if ($result ne 'ok') {
+    if ($result eq 'ok') {
+        $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
+    } else {      
 	$r->print('<span class="LC_error">'.
-		  &mt('An errror occured ([_1]) while trying to rename [_2]'
+		  &mt('An error occured ([_1]) while trying to rename [_2]'
 		      .' to [_3]',$result,&display_file(),
 		      &display_file('',$filenewname)).'</span><br />');
+        return;
     }
     if ($filenewname ne $env{'form.filenewname'}) {
         $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",
 		      '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
 		      '<strong>'.&display_file('',$filenewname).'</strong>'));
     }
+    $r->print($chg_access);
     $r->print(&done(undef,$url));
 }
 
+sub access_for_renamed {
+    my ($filenewname,$group,$udom,$uname) = @_;
+    my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'};
+    $oldfile = &prepend_group($oldfile);
+    my $newfile = $env{'form.currentpath'}.$filenewname;
+    $newfile = &prepend_group($newfile);
+    my $current_permissions =
+	&Apache::lonnet::get_portfile_permissions($udom,$uname);
+    my %access_controls =
+	&Apache::lonnet::get_access_controls($current_permissions,
+					     $group,$oldfile);
+    my $chg_text;
+    if (keys(%access_controls) > 0) {
+        my %change_old;
+        my %change_new;
+        foreach my $key (keys(%{$access_controls{$oldfile}})) {
+            $change_old{'delete'}{$key} = 1;
+            $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key};
+        }
+        my ($outcome,$deloutcome,$new_values,$translation) =
+            &Apache::lonnet::modify_access_controls($oldfile,\%change_old,
+						    $udom,$uname);
+        if ($outcome ne 'ok') {
+            $chg_text ='<br /><br />'.&mt("An error occured ([_1]) while ".
+                "trying to delete access control records for the old name.",$outcome).
+                '</span><br />';
+        } else {
+            if ($deloutcome ne 'ok') {
+                $chg_text = '<br /><br /><span class="LC_error"><br />'.
+		    &mt("An error occured ([_1]) while ".
+			"trying to delete access control records for the old name.",$deloutcome).
+			'</span><br />';
+            }
+        }
+        ($outcome,$deloutcome,$new_values,$translation) =
+            &Apache::lonnet::modify_access_controls($newfile,\%change_new,
+                                                    $udom,$uname);
+        if ($outcome ne 'ok') {
+            $chg_text .= '<br /><br />'.
+		&mt("An error occured ([_1]) while ".
+                "trying to update access control records for the new name.",$outcome).
+                '</span><br />';
+        }
+        if ($chg_text eq '') {
+            $chg_text = '<br /><br />'.&mt('Access controls updated to reflect the name change.');
+        }
+    }
+    return $chg_text;
+}
+
 sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;
     my ($uname,$udom) = &get_name_dom();
@@ -578,8 +738,17 @@ sub display_access {
                                                                         $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 $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>';
+    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.');
+    $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
+    $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
+    $info .= '</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 />';
+    $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
+    $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+    if ($group eq '') {
+        $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (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><br />"));
+    }
+    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -620,8 +789,10 @@ sub view_access_settings {
     } else {
         $r->print(&mt('No access control settings currently exist for this file.<br />' ));
     }
-    $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
-              &group_args().'">'.&mt('Return to directory listing').'</a>');
+    my %anchor_fields = (
+        'currentpath' => $env{'form.currentpath'}
+    );
+    $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
     return;
 }
 
@@ -754,7 +925,7 @@ 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);
     my ($uname,$udom) = &get_name_dom();
@@ -845,12 +1016,13 @@ sub update_access {
         }
         &close_form($r,$url);
     } else {
-        $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>');
+        my %anchor_fields = (
+            'currentpath' => $env{'form.currentpath'},
+            'access' => $env{'form.selectfile'}
+        );
+        $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+        delete $anchor_fields{'access'};
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
     }
     return;
 }
@@ -1491,10 +1663,6 @@ sub upload {
             $file_name = $env{'form.currentpath'}.$file_name;
             $file_name = &prepend_group($file_name);
             $found_file = 1;
-	    # FIXME I think this is incorrect, prepend_group took care of this?
-            if (defined($group)) {
-                $file_name = $group.'/'.$file_name;
-            }
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;
             } 
@@ -1538,24 +1706,35 @@ sub lock_info {
     $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') {
-                my $filetext;
-                if (defined($group)) {
-                    $filetext = '<strong>'.$env{'form.lockinfo'}.
-                                    '</strong> (group: '.$group.')'; 
-                } else {
-                    $filetext = '<strong>'.$file_name.'</strong>';
-                } 
-                $r->print(&mt('[_1] was submitted in response to problem: ',
-                              $filetext).
-                          '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
-                          '</strong><br />');
-                my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
-                $r->print(&mt('In the course: <strong>[_1]</strong><br />',
-                              $course_description{'description'}));
-                # $r->print('the third is '.$$array_item[2].'<br>');
-                # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
-            }
+            next if (ref($array_item) ne 'ARRAY');
+
+	    my $filetext;
+	    if (defined($group)) {
+		$filetext = '<strong>'.$env{'form.lockinfo'}.
+		    '</strong> (group: '.$group.')'; 
+	    } else {
+		$filetext = '<strong>'.$file_name.'</strong>';
+	    } 
+	    
+	    my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
+		'</strong><br />';
+	    if ($$array_item[-1] eq 'graded') {
+		$r->print(&mt('[_1] was submitted in response to problem: [_2]',
+                              $filetext,$title));
+	    } elsif ($$array_item[-1] eq 'handback') {
+		$r->print(&mt('[_1] was handed back in response to problem: [_2]',
+                              $filetext,$title));
+	    } else {
+		# submission style lock
+		$r->print(&mt('[_1] was submitted in response to problem: [_2]',
+                              $filetext,$title));
+	    }
+	    my %course_description = 
+		&Apache::lonnet::coursedescription($$array_item[1]);
+	    if ( $course_description{'description'} ne '') {
+		$r->print(&mt('In the course: <strong>[_1]</strong><br />',
+			      $course_description{'description'}));
+	    }
         }
     }
     $r->print(&done('Back',$url));
@@ -1601,13 +1780,19 @@ sub createdir {
 }
 
 sub get_portfolio_root {
-    my ($uname,$udom) = &get_name_dom();
-    my $path;
-    if (defined($env{'form.group'})) {
-        $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
-    } else {
-        $path = '/userfiles/portfolio';
+    my ($udom,$uname,$group) = @_;
+    if (!(defined($udom)) || !(defined($uname))) {
+        ($uname,$udom) = &get_name_dom();
+    }
+    my $path = '/userfiles/portfolio';
+    if (!defined($group)) { 
+        if (defined($env{'form.group'})) {
+            $group = $env{'form.group'};      
+        }
     }
+    if (defined($group)) {
+        $path = '/userfiles/groups/'.$group.'/portfolio';
+    } 
     return (&Apache::loncommon::propath($udom,$uname).$path);
 }
 
@@ -1848,7 +2033,7 @@ sub handler {
         }
     } 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');
         }
@@ -1872,7 +2057,7 @@ sub handler {
         }
     } 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');
         }