--- loncom/interface/portfolio.pm	2006/07/19 21:59:10	1.121.2.8
+++ loncom/interface/portfolio.pm	2006/11/06 20:02:58	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.121.2.8 2006/07/19 21:59:10 albertel Exp $
+# $Id: portfolio.pm,v 1.171 2006/11/06 20:02:58 rezaferry Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,12 +66,15 @@ sub group_form_data {
 # 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;
 }
 
@@ -92,6 +95,13 @@ sub display_common {
 					 'createdir_label' => 
 					 'Create subdirectory in current directory:');
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
+	my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
+	my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
+		
+	# FIXME: This line should be deleted once Portfolio uses breadcrumbs
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio'));
+
+		
         $r->print(<<"TABLE"); 
 <table id="LC_portfolio_actions">
   <tr id="LC_portfolio_upload">
@@ -106,7 +116,7 @@ sub display_common {
 	<input type="hidden" name="action" value="$env{"form.action"}" />
 	<input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
 	<input type="hidden" name="mode" value="$env{"form.mode"}" />
-	<input type="submit" name="storeupl" value="$text{'upload'}" />
+	<input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload
       </form>
     </td>
   </tr>
@@ -121,7 +131,7 @@ sub display_common {
         <input type="hidden" name="action" value="$env{"form.action"}" />
         <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
         <input type="hidden" name="mode" value="$env{"form.mode"}" />
-        <input type="submit" name="createdir" value="$text{'createdir'}" />
+        <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir
       </form>
     </td>
   </tr>
@@ -129,15 +139,30 @@ 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>');
+    $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
     &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('">'.
@@ -146,6 +171,59 @@ TABLE
     $r->print("</form>");
 }
 
+sub display_directory_line {
+    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, $versions)=@_;
+
+    my $fullpath =  &prepend_group($current_path.$filename);
+    $r->print('<tr class="'.$css_class.'">');
+    $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;');
+        my %anchor_fields = (
+            'access' => $filename,
+            'currentpath' => $current_path
+        );
+	$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
+    }
+    $r->print('</tr>'.$/);
+}
+
 sub display_directory {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;
@@ -166,7 +244,7 @@ sub display_directory {
                                                   $current_permissions,$group);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;
-    if ($env{"form.mode"} eq 'selectfile'){
+    if ($env{"form.mode"} eq 'selectfile') {
 	&select_files($r);
 	$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
 	$select_mode = 'true';
@@ -186,11 +264,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(&Apache::loncommon::help_open_topic('Portfolio FileList',
+						      'Using the portfolio file list'));
         $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'.
+		  &Apache::loncommon::help_open_topic('Portfolio FileAction').
+		  '</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.
+		  &Apache::loncommon::help_open_topic('Portfolio OpenFile').
+		  '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
+		  &Apache::loncommon::help_open_topic('Portfolio ShareFile').
+		  '</th></tr>');
     }
     $r->print("\n".&group_form_data()."\n");
 
@@ -198,7 +284,7 @@ sub display_directory {
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;
     my %versioned;
-    foreach my $line (sort 
+    foreach my $dir_line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
 			  my ($bfile)=split('&',$b,2);
@@ -206,18 +292,49 @@ 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) {
-    	    $versioned{$fname} .= $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]);
     	}
-        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 $show_versions;
+	    my $fullpath =  &prepend_group($current_path.$filename);
+    	    if ($env{'form.showversions'} =~ /$filename/) {
+    	        $show_versions = 'true';
+    	    }
+    	    if (exists($versioned{$fullpath})) {
+    	        my %anchor_fields = (
+    	            'selectfile' => $fullpath,
+    	            'continue' => 'false',
+    	            'currentpath' => $current_path,
+    	        );
+    	        if ($show_versions) {
+    	            # 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 {
+    	            # 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 = '&nbsp;';
+    	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){
@@ -225,19 +342,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>'.&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 $version_flag;
-                if (exists($versioned{$fname})) {
-                   $version_flag = "*";
-                } else {
-                    $version_flag = "";
-                }
-               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') {
@@ -246,7 +362,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) {
@@ -258,16 +377,19 @@ 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><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>';
                     }
                 }
-		$r->print('<tr class="'.$css_class.'">');
-		$r->print($line);
 		my $curr_access;
 		if ($select_mode ne 'true') {
 		    my $pub_access = 0;
@@ -301,19 +423,19 @@ sub display_directory {
 			$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>');
+                &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) {
+		    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);
+		    }
 		}
-		$r->print('</tr>'.$/);
             }
         }
     }
@@ -330,7 +452,8 @@ sub display_directory {
         $r->print('</table>');
         if ($can_delete) {
             $r->print('
-        <input type="submit" name="doit" value="Delete Checked Files" />
+        <input type="submit" name="doit" value="Delete Checked Files" />'.
+	&Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>'
@@ -399,12 +522,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;
 }
 
@@ -416,7 +540,7 @@ sub delete {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     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("The file is locked and cannot be deleted.<br />");
         $r->print(&done('Back',$url));
     } else {
         if (scalar(@files)) {
@@ -431,18 +555,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));
@@ -490,7 +651,7 @@ sub rename {
     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("The file is locked and cannot be renamed.<br />");
         $r->print(&done(undef,$url));
     } else {
         &open_form($r,$url);
@@ -501,7 +662,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();
@@ -512,26 +673,81 @@ 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 ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
     my ($uname,$udom) = &get_name_dom();
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);
@@ -539,27 +755,29 @@ 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,$info);
+    if ($action eq 'chgaccess') {
+        $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+        $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>'.&explain_conditionals();
+        $info .= '</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 />"));
+        }
+    } else {
+        $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
+                  &explain_conditionals().'<br />';
+    }
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
-        &access_setting_table($r,$access_controls{$file_name});
+	$r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
+	$r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
+        &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
+                              $action);
         my $button_text = {
                         'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),
@@ -574,6 +792,13 @@ sub display_access {
     }
 }
 
+sub explain_conditionals {
+    return
+        &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".
+        &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n".
+        &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+}
+
 sub view_access_settings {
     my ($r,$url,$access_controls,$aclcount) = @_;
     my ($showstart,$showend);
@@ -596,8 +821,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;
 }
 
@@ -610,9 +837,8 @@ sub build_access_summary {
                       domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',
                       course => 'Conditional: course-based',
-                      group => 'Conditional: group-based',
                      );
-    my @allscopes = ('public','guest','domains','users','course','group');
+    my @allscopes = ('public','guest','domains','users','course');
     foreach my $scope (@allscopes) {
         if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
             next;
@@ -635,7 +861,7 @@ sub build_access_summary {
                 }
             }
             $r->print('<td>'.&mt($scope_desc{$scope}));
-            if (($scope eq 'course') || ($scope eq 'group')) {
+            if ($scope eq 'course') {
                 if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);
@@ -647,16 +873,12 @@ sub build_access_summary {
             if ($chg ne 'delete') {
                 if ($scope eq 'guest') {
                     $r->print(&mt('Passphrase').': '.$content->{'password'});
-                } elsif ($scope eq 'course' || $scope eq 'group') {
+                } elsif ($scope eq 'course') {
                     $r->print('<table><tr>');
                     $r->print('<th>'.&mt('Roles').'</th><th>'.
                           &mt('Access').'</th><th>'.
                                           &mt('Sections').'</th>');
-                    if ($scope eq 'course') {
-                        $r->print('<th>'.&mt('Groups').'</th>');
-                    } else {
-                        $r->print('<th>'.&mt('Teams').'</th>');
-                    }
+                    $r->print('<th>'.&mt('Groups').'</th>');
                     $r->print('</tr>');
                     foreach my $id (sort(keys(%{$content->{'roles'}}))) {
                         $r->print('<tr>');
@@ -680,11 +902,11 @@ sub build_access_summary {
                             } else {
                                 $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
                             }
-                            $r->print('</tr>');
+                            $r->print('</td>');
                         }
-			$r->print("</table>");
+			$r->print('</tr>');
                     }
-		    $r->print("</tr></table>");
+		    $r->print('</table>');
                 } elsif ($scope eq 'domains') {
                     $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
                 } elsif ($scope eq 'users') {
@@ -730,7 +952,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();
@@ -798,14 +1020,14 @@ sub update_access {
     my $totalnew = 0;
     my $status = 'new';
     my ($firstitem,$lastitem);
-    foreach my $newitem ('course','group','domains','users') {
+    foreach my $newitem ('course','domains','users') {
         $allnew += $env{'form.new'.$newitem};
     }
     if ($allnew > 0) {
         my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.
         &open_form($r,$url);
-        foreach my $newitem ('course','group','domains','users') {
+        foreach my $newitem ('course','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 />');
                 $firstitem = $totalnew;
@@ -821,12 +1043,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;
 }
@@ -843,7 +1066,7 @@ sub build_access_record {
 		
     if ($scope eq 'guest') {	
         $record->{'password'} = $env{'form.password'};
-    } elsif (($scope eq 'course') || ($scope eq 'group')) {
+    } elsif ($scope eq 'course') {
         $record->{'domain'} = $env{'form.crsdom_'.$num};
 	$record->{'number'} = $env{'form.crsnum_'.$num};
         my @role_ids;
@@ -925,19 +1148,18 @@ sub sort_users {
 }
 
 sub access_setting_table {
-    my ($r,$access_controls) = @_;
+    my ($r,$url,$filename,$access_controls,$action) = @_;
     my ($public,$publictext);
-    $publictext = &mt('Off');
+    $publictext ='Off';
     my ($guest,$guesttext);
-    $guesttext = &mt('Off');
+    $guesttext = 'Off';
     my @courses = ();
-    my @groups = ();
     my @domains = ();
     my @users = ();
     my $now = time;
     my $then = $now + (60*60*24*180); # six months approx.
     my ($num,$scope,$publicnum,$guestnum);
-    my (%acl_count,%end,%start);
+    my (%acl_count,%end,%start,%conditionals);
     foreach my $key (sort(keys(%{$access_controls}))) {
         ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
         if ($scope eq 'public') {
@@ -948,19 +1170,34 @@ sub access_setting_table {
             $guest=$key;
             $guestnum = $num;  
             $guesttext = &acl_status($start{$key},$end{$key},$now);
-        } elsif ($scope eq 'course') {
-            push(@courses,$key);
-        } elsif ($scope eq 'group') {
-            push(@groups,$key);
-        } elsif ($scope eq 'domains') {
-            push(@domains,$key);
-        } elsif ($scope eq 'users') {
-            push(@users,$key);
+        } else {
+            $conditionals{$scope}{$key} = $$access_controls{$key};
+            if ($scope eq 'course') {
+                push(@courses,$key);
+            } elsif ($scope eq 'domains') {
+                push(@domains,$key);
+            } elsif ($scope eq 'users') {
+                push(@users,$key);
+            }
         }
         $acl_count{$scope} ++;
     }
     $r->print('<table border="0"><tr><td valign="top">');
-    $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');
+    if ($action eq 'chgaccess') {
+        &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
+                           \%end,$public,$publicnum,$publictext,$guest,$guestnum,
+                           $guesttext,$access_controls,%conditionals);
+    } else {
+        &condition_setting($r,$access_controls,$now,$then,\%acl_count,
+                           \@domains,\@users,\@courses);
+    }
+    $r->print('</td></tr></table>');
+}
+
+sub standard_settings {
+    my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
+      $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
+    $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
@@ -968,7 +1205,7 @@ sub access_setting_table {
     $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
-                  &dateboxes($publicnum,$start{$public},$end{$public}).'</td>');
+             &dateboxes($publicnum,$start->{$public},$end->{$public}).'</td>');
     } else {
         $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.
                   &dateboxes('0',$now,$then).'</td>');
@@ -976,7 +1213,7 @@ sub access_setting_table {
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
     $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
-    $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>');
+    $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
@@ -987,7 +1224,7 @@ sub access_setting_table {
     if ($guest) {
         $passwd = $$access_controls{$guest}{'password'};
         $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.
-                  &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>');
+              &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'</td>');
     } else {
         $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.
                   &dateboxes('1',$now,$then).'</td>');
@@ -996,37 +1233,75 @@ sub access_setting_table {
               $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());
+    $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr>'.
+              '<tr><td colspan="3">');
+    my $numconditionals = 0;
+    my $conditionstext;
+    my %cond_status;
+    foreach my $scope ('domains','users','course') {
+        $numconditionals += $acl_count->{$scope}; 
+        if ($acl_count->{$scope} > 0) {
+            if ($conditionstext ne 'Active') { 
+                foreach my $key (keys(%{$conditionals{$scope}})) {
+                    $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
+                    if ($conditionstext eq 'Active') {
+                       last;
+                    }
+                }
+            }
+        }
+    }
+    if ($conditionstext eq '') {
+        $conditionstext = 'Off';
+    }
+    my %anchor_fields = (
+            'access' => $env{'form.selectfile'},
+            'action' => 'chgconditions',
+            'currentpath' => $env{'form.currentpath'},
+        );
+    $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');
+    if ($numconditionals > 0) {
+        my $count = 1;
+        my $chg = 'none';
+        $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'<br /><br />');
+        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_data_table_header_row());
+        $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
+                  '</th><th>'.&mt('Additional information').'</th>');
+        $r->print(&Apache::loncommon::end_data_table_header_row());
+        &build_access_summary($r,$count,$chg,%conditionals);
+        $r->print(&Apache::loncommon::end_data_table());
+    } else {
+        $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+    }
+}
 
-    #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
-    #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
-    #$r->print('</td><td>&nbsp;</td><td valign="top">');
-    #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
-    #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
-    #if (@courses > 0 || @groups > 0) {
-    #    $r->print('<td colspan="3" valign="top">');
-    #} else {
-    #    $r->print('<td valign="top">');
-    #}
-    #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
-    #$r->print('</td>');
-    #if (@courses > 0 || @groups > 0) {
-    #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
-    #} else {
-    #    $r->print('<td>&nbsp;</td><td valign="top">');
-    #}
-    #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
+sub condition_setting {
+    my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+    $r->print('<tr><td valign="top">');
+    &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then);
+    $r->print('</td><td>&nbsp;</td><td valign="top">');
+    &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
+    $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
+    if ($acl_count->{course} > 0) {
+        $r->print('<td colspan="3" valign="top">');
+    } else {
+        $r->print('<td valign="top">');
+    }
+    &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
+    $r->print('</td>');
     $r->print('</td></tr></table>');
 }
 
 sub acl_status {
     my ($start,$end,$now) = @_;
     if ($start > $now) {
-        return &mt('Inactive');
+        return 'Inactive';
     }
     if ($end && $end<$now) {
-        return &mt('Inactive');
+        return 'Inactive';
     }
-    return &mt('Active');
+    return 'Active';
 }
 
 sub access_element {
@@ -1061,7 +1336,7 @@ sub display_access_row {
         $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
               &mt('Dates available').'</th>');
-        if (($type eq 'course') || ($type eq 'group')) {
+        if ($type eq 'course') {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
                       '</th>');
             $colspan ++;
@@ -1071,7 +1346,7 @@ sub display_access_row {
         $r->print(&Apache::loncommon::end_data_table_header_row());
         foreach my $key (@{$items}) {
 	    $r->print(&Apache::loncommon::start_data_table_row());
-            if (($type eq 'course') || ($type eq 'group')) {
+            if ($type eq 'course') {
                 &course_row($r,$status,$type,$key,$access_controls,$now,$then);
             } elsif ($type eq 'domains') {
                 &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
@@ -1148,10 +1423,6 @@ sub course_row {
     }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
 	.&course_js();
-    my $crsgrptext = 'Groups';
-    if ($type eq 'group') {
-        $crsgrptext = 'Teams';
-    }
     my $uctype = $type;
     $uctype =~ s/^(\w)/uc($1)/e;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
@@ -1168,7 +1439,7 @@ sub course_row {
     $r->print('<td><table><tr>');
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.
               &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.
-              &mt($crsgrptext).'</th></tr>');
+              &mt('Groups').'</th></tr>');
     if ($status eq 'old') {
         my $max_id = 0;
         foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
@@ -1238,7 +1509,12 @@ sub actionbox {
     my ($status,$num,$scope) = @_;
     my $output = '<span style="white-space: nowrap"><label>';
     if ($status eq 'new') {
-        $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.
+        my $checkstate;
+        if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
+            $checkstate = 'checked="checked"';
+        }
+        $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
+                   $checkstate.'  />'.
         &mt('Activate');
     } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.
@@ -1366,10 +1642,6 @@ sub role_options_window {
     my $cnum = $env{'form.cnum'};
     my $type = $env{'form.type'};
     my $addindex = $env{'form.setroles'};
-    my $grouptitle = 'Groups';
-    if ($type eq 'Group') {
-         $grouptitle = 'Teams';
-    } 
     my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');
     $r->print(<<"END_SCRIPT");
 <script type="text/javascript">
@@ -1390,7 +1662,7 @@ function setRoles() {
 </script>
 END_SCRIPT
     $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
-    $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+    $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
     return;
 }
 
@@ -1468,10 +1740,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;
             } 
@@ -1515,24 +1783,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));
@@ -1578,13 +1857,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);
 }
 
@@ -1712,8 +1997,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['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);
+          'cnum','cdom','type','setroles','showversions','ref']);
+    my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
         $caller = $2;
@@ -1825,7 +2110,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');
         }
@@ -1849,7 +2134,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');
         }
@@ -1863,9 +2148,12 @@ sub handler {
         }
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
-        $env{'form.action'} = 'chgaccess';
-        &display_access($r,$url,$group,$can_setacl,$port_path);
-    } elsif ($env{'form.action'} eq 'chgaccess') {
+        if (!defined($env{'form.action'})) { 
+            $env{'form.action'} = 'chgaccess';
+        }
+        &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
+    } elsif (($env{'form.action'} eq 'chgaccess') || 
+             ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);
         } else {