--- loncom/interface/portfolio.pm	2009/10/23 09:33:45	1.216
+++ loncom/interface/portfolio.pm	2014/06/18 17:37:48	1.253
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.216 2009/10/23 09:33:45 bisitz Exp $
+# $Id: portfolio.pm,v 1.253 2014/06/18 17:37:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,7 @@ use Apache::lonnet;
 use Apache::longroup;
 use Apache::lonhtmlcommon;
 use HTML::Entities;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub group_args {
     my $output;
@@ -63,7 +63,7 @@ sub group_form_data {
     return $output;
 } 
 
-# receives a file name and path stub from username/userfiles/portfolio/
+# receives a filename and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
     my ($url, $anchor_fields, $inner_text) = @_;
@@ -98,7 +98,7 @@ sub display_common {
 	my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
 	my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
         my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
-        $r->print(&display_usage($group));
+        $r->print(&display_portfolio_usage($group,$help_portfolio));
         my $parse_check;
         if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";
@@ -112,7 +112,6 @@ sub display_common {
 END
         }
 
-        $r->print('<div>'.$help_portfolio);
         # Upload File
         $r->print('<div class="LC_left_float">'
                  .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
@@ -122,6 +121,7 @@ END
                  .'<input name="uploaddoc" type="file" />'
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+                 .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
@@ -139,6 +139,7 @@ END
                  .'<input name="newdir" type="text" />'.$groupitem
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
+                 .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
@@ -147,7 +148,6 @@ END
                  .'</form>'
                  .'</div>'
         );
-        $r->print('</div>');
     } # end "if can_upload"
 
     my @tree = split (/\//,$current_path);
@@ -155,6 +155,7 @@ END
         'selectfile'    => $port_path,
         'currentpath'   => '/',
         'mode'          => $env{"form.mode"},
+        'symb'          => $env{"form.symb"},
         'fieldname'     => $env{"form.fieldname"},
         'continue'      => $env{"form.continue"}
     );
@@ -168,6 +169,7 @@ END
                 'selectfile' => $tree[$i],
                 'currentpath' => $newCurrentPath,
                 'mode' => $env{"form.mode"},
+                'symb' => $env{"form.symb"},
                 'fieldname' => $env{"form.fieldname"},
                 'continue' => $env{"form.continue"}
             );
@@ -177,53 +179,28 @@ END
     $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('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.'&amp;symb='.$env{'form.symb'}.&group_args());
     $r->print('">'.
 	      &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
 }
 
-sub display_usage {
-    my ($group) = @_;
+sub display_portfolio_usage {
+    my ($group,$helpitem) = @_;
     my $disk_quota = &get_quota($group);
     my $getpropath = 1;
     my $portfolio_root = &get_portfolio_root();
     my ($uname,$udom) = &get_name_dom($group);
     my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-    my $usage = $current_disk_usage/1000;
-    my $quota = $disk_quota/1000;
-    my $percent;
-    if ($disk_quota == 0) {
-        $percent = 100.0;
-    } else {
-        $percent = 100*($current_disk_usage/$disk_quota);
-    }
-    $usage = sprintf("%.2f",$usage);
-    $quota = sprintf("%.2f",$quota);
-    $percent = sprintf("%.0f",$percent);
-    my ($color,$cssclass);
-    if ($percent <= 60) {
-        $color = '#00A000';
-    } elsif ($percent > 60 && $percent < 90) {
-        $color = '#FFD300';
-        $cssclass = 'class="LC_warning"';
-    } elsif( $percent >= 90) {
-        $color = '#FF0000';
-        $cssclass = 'class="LC_error"';
-    }
-    my $prog_width = $percent;
-    if ($prog_width > 100) {
-        $prog_width = 100;
-    }
-    my $disk_meter = '
-  <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
-'   <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
-'    <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
-'   </div>'."\n".
-'  </div>';
-    return $disk_meter;
+    return &Apache::loncommon::head_subbox(
+                     '<div style="float:right;padding-top:0;margin-top;0">'
+                    .$helpitem
+                    .'</div>'
+                    .'<div>'
+                    .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+                    .'</div>');
 }
 
 sub display_directory_line {
@@ -287,7 +264,6 @@ sub display_directory {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $display_out;
     my $select_mode;
     my $checked_files;
     my $port_path = &get_port_path();
@@ -304,30 +280,17 @@ sub display_directory {
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;
     if ($env{"form.mode"} eq 'selectfile') {
-	&select_files($r);
-	$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
-	$select_mode = 'true';
-    } 
-    if ($is_empty && ($current_path ne '/') && $can_delete) {
-        $display_out = '<form method="post" action="'.$url.'">'.
-	    &group_form_data().
-        '<input type="hidden" name="action" value="deletedir" />'.
-        '<p>'.
-        '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
-        '</p>'.
-        '<input type="hidden" name="selectfile" value="" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '</form>';
-        
-        $r->print($display_out);
-	return;
+        &select_files($r,$dir_list);
+        $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
+        $select_mode = 'true';
     }
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print(&Apache::loncommon::start_data_table()
                  .&Apache::loncommon::start_data_table_header_row()
                  .'<th>'.&mt('Select').'</th>'
-                 .'<th>&nbsp;</th><th>&nbsp;</th>'
+                 .'<th>&nbsp;</th>'
+                 .'<th>&nbsp;</th>'
                  .'<th>'.&mt('Name').'</th>'
                  .'<th>'.&mt('Size').'</th>'
                  .'<th>'.&mt('Last Modified').'</th>'
@@ -336,12 +299,18 @@ sub display_directory {
         );
     } else {
         $r->print('<form method="post" action="'.$url.'">');
-	$r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
-						      &mt('Using the portfolio file list')));
+        $r->print(
+            '<p>'
+           .&Apache::loncommon::help_open_topic(
+                'Portfolio FileList',
+                &mt('Using the portfolio file list'))
+           .'</p>'
+        );
         $r->print(&Apache::loncommon::start_data_table()
                  .&Apache::loncommon::start_data_table_header_row()
                  .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
-                 .'<th>&nbsp;</th><th>&nbsp;</th>'
+                 .'<th>&nbsp;</th>'
+                 .'<th>&nbsp;</th>'
                  .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
                  .'<th>'.&mt('Size').'</th>'
                  .'<th>'.&mt('Last Modified').'</th>'
@@ -349,29 +318,64 @@ sub display_directory {
                  .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
                  .&Apache::loncommon::end_data_table_header_row());
     }
+
+    # Empty directory?
+    if ($is_empty && ($current_path ne '/') && $can_delete) {
+        my $cols = ($select_mode eq 'true') ? 7 : 9;
+        # Empty message
+        $r->print(
+            &Apache::loncommon::start_data_table_row()
+           .'<td colspan="'.$cols.'">'
+           .'<p class="LC_info">'
+           .&mt('This directory is empty.')
+           .'</p>'
+           .'</td>'
+           .&Apache::loncommon::end_data_table_row()
+           .&Apache::loncommon::end_data_table()
+           .'</form>'
+        );
+        # Delete button
+        $r->print(
+            '<form method="post" action="'.$url.'">'.
+            &group_form_data().
+            '<input type="hidden" name="action" value="deletedir" />'.
+            '<p>'.
+            '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+            '</p>'.
+            '<input type="hidden" name="selectfile" value="" />'.
+            '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+            '</form>'
+        );
+        # Directory is empty, so nothing else to display
+        return;
+    }
+
     $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 %versioned;
-    foreach my $dir_line (sort 
-		      { 
-			  my ($afile)=split('&',$a,2);
-			  my ($bfile)=split('&',$b,2);
-			  return (lc($afile) cmp lc($bfile));
-		      } (@$dir_list)) {
-    	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) {
-	    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]);
-    	}
+    if (ref($dir_list) eq 'ARRAY') { 
+        foreach my $dir_line (sort 
+		          { 
+			      my ($afile)=split('&',$a,2);
+			      my ($bfile)=split('&',$b,2);
+			      return (lc($afile) cmp lc($bfile));
+		          } (@{$dir_list})) {
+    	    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) {
+	        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]);
+    	    }
+        }
     }
+    my $zerobyte;
     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);
@@ -420,6 +424,7 @@ sub display_directory {
                     'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',
                     'mode'          => $env{"form.mode"},
+                    'symb'          => $env{"form.symb"},
                     'fieldname'     => $env{"form.fieldname"},
                     'continue'      => $env{"form.continue"}
                 );  
@@ -431,11 +436,16 @@ sub display_directory {
 		my $css_class = 'LC_browser_file';
 		my $line;
                 if ($select_mode eq 'true') {
-                    $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
-		    if ($$checked_files{$filename} eq 'selected') {
-                        $line.=' checked="checked" ';
+                    if ($size > 0) {
+                        $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
+		        if ($$checked_files{$filename} eq 'selected') {
+                            $line.=' checked="checked" ';
+                        }
+		        $line.=' /></td>';
+                    } else {
+                        $line = '<td>&nbsp;</td>';
+                        $zerobyte ++;
                     }
-		    $line.=' /></td>';
                 } else {
                     if (exists $locked_files{$fullpath}) {
                         my %anchor_fields = (
@@ -453,8 +463,7 @@ sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }
                         if ($can_modify) {
-                            my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'"/>';
-# 	src="'.#&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
+                            my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'" title="'.&mt('Metadata').'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').'" />';
                             my %anchor_fields = (
                                 'rename' => $filename,
                                 currentpath => $current_path
@@ -516,13 +525,18 @@ sub display_directory {
         }
     }
     if ($select_mode eq 'true') {
-        $r->print(&Apache::loncommon::end_data_table().'
+        $r->print(&Apache::loncommon::end_data_table());
+        if ($zerobyte) {
+            $r->print('<p class="LC_warning">'.&mt('[quant,_1,file] in list not selectable as file size is 0 bytes.',$zerobyte).'</p>');
+        }
+        $r->print('
             <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+            <input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />
             <input type="hidden" name="mode" value="selectfile" />
             <p>
             <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
-            <input type="button" name="doit" onClick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
+            <input type="button" name="doit" onclick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
             </p>
             <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>');        
@@ -598,17 +612,19 @@ sub display_file {
 }
 
 sub done {
-    my ($message,$url)=@_;
-    unless (defined $message) {
-        $message='Done';
+    my ($linktext,$url)=@_;
+    unless (defined($linktext)) {
+        $linktext='Return to directory';
     }
     my %anchor_fields = (
         'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},
+        'symb'      => $env{'form.symb'},
         'mode'      => $env{'form.mode'}
     );
-    my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
+    my $result = &Apache::lonhtmlcommon::actionbox(
+                     [&make_anchor($url,\%anchor_fields,&mt($linktext))]);
     return $result;
 }
 
@@ -620,15 +636,19 @@ sub delete {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-        $r->print(&mt('The file is locked and cannot be deleted.').'<br />');
-        $r->print(&done('Back',$url));
+        $r->print(
+            '<p class="LC_warning">'
+           .&mt('The file is locked and cannot be deleted.')
+           .'</p>'
+           .&done(undef,$url)
+        );
     } else {
         if (scalar(@files)) {
             &open_form($r,$url);
             $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
             &close_form($r,$url);
         } else {
-            $r->print("No file was checked to delete.<br />");
+            $r->print('<p class="LC_warning">'.&mt('No file was checked to delete.').'</p>');
             $r->print(&done(undef,$url));
         }
     }
@@ -642,18 +662,21 @@ sub delete_confirmed {
     my $port_path = &get_port_path();
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);
+    my @msg;
     foreach my $delete_file (@files) {
-        $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
-					       $env{'form.currentpath'}.
-					       $delete_file);
+        $result =
+            &Apache::lonnet::removeuserfile(
+                $uname,$udom,$port_path.
+                $env{'form.currentpath'}.
+                $delete_file);
         if ($result ne 'ok') {
-	    $r->print('<span class="LC_error">'
-                      .&mt('An error occurred ([_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)));
+            push(@msg, &Apache::lonhtmlcommon::confirm_success(
+                &mt('An error occurred ([_1]) while trying to delete [_2].'
+                    ,$result,&display_file(undef, $delete_file)),1));
+        } else {
+            push(@msg, &Apache::lonhtmlcommon::confirm_success(
+                &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 = 
@@ -669,23 +692,24 @@ sub delete_confirmed {
                     &Apache::lonnet::modify_access_controls($file_name,\%changes,
                                                             $udom,$uname);
                     if ($outcome ne 'ok') {
-                           $r->print('<br />'.&mt("An error occurred ([_1]) while ".
-                               "trying to delete access controls for the file.",$outcome).
-                               '</span><br /><br />');
+                        push(@msg, &Apache::lonhtmlcommon::confirm_success(
+                            &mt('An error occurred ([_1]) while '.
+                                'trying to delete access controls for the file.',$outcome),1));
                     } else {
                         if ($deloutcome eq 'ok') {
-                            $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');
+                            push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message?
                         } else {
-                            $r->print('<span class="LC_error">'.'<br />'.
-                               &mt("An error occurred ([_1]) while ".
-                                   "trying to delete access controls for the file.",$deloutcome).
-                                   '</span><br /><br />');
+                            push(@msg, &Apache::lonhtmlcommon::confirm_success(
+                                &mt('An error occurred ([_1]) while '.
+                                    'trying to delete access controls for the file.'
+                                    ,$deloutcome),1));
                         }
                     }
                 }
             }
         }
     }
+    $r->print(&Apache::loncommon::confirmwrapper(join('<br />',@msg)));
     $r->print(&done(undef,$url));
 }
 
@@ -705,12 +729,15 @@ sub delete_dir_confirmed {
     my $port_path = &get_port_path();
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $directory_name);
-					       
+       
     if ($result ne 'ok') {
-	$r->print('<span class="LC_error">'
-                  .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
-                       ,$result,$directory_name)
-                  .'</span><br />');
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
+                        ,$result,$directory_name),1)));
+        $r->print(&done(undef,$url));
+        return;
     } else {
         # now remove from recent
         &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
@@ -721,6 +748,10 @@ sub delete_dir_confirmed {
         }
         $env{'form.currentpath'} = $directory_name;
     }
+    $r->print(
+        &Apache::loncommon::confirmwrapper(
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('Directory successfully deleted'))));
     $r->print(&done(undef,$url));
 }
 
@@ -730,7 +761,11 @@ sub rename {
     my ($uname,$udom) = &get_name_dom($group);
     $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(
+            '<p class="LC_error">'
+           .&mt('The file is locked and cannot be renamed.')
+           .'</p>'
+        );
         $r->print(&done(undef,$url));
     } else {
         &open_form($r,$url);
@@ -745,13 +780,32 @@ sub rename_confirmed {
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
     my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path();
+
+    # Display warning in case of filename cleaning has changed the filename
+    if ($filenewname ne $env{'form.filenewname'}) {
+        $r->print(
+            '<p><span class="LC_warning">'
+           .&mt('Invalid characters')
+           .'</span><br />'
+           .&mt('The new filename was changed from [_1] to [_2].'
+               ,'<span class="LC_filename">'.&display_file('',$env{'form.filenewname'}).'</span>'
+               ,'<span class="LC_filename">'.&display_file('',$filenewname).'</span>')
+           .'</p>'
+        );
+                
+    }
+
+    # Filename empty?
     if ($filenewname eq '') {
-	$r->print('<span class="LC_error">'.
-		  &mt("Error: no valid filename was provided to rename to.").
-		  '</span><br />');
-	$r->print(&done(undef,$url));
-	return;
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Error: no valid filename was provided to rename to.'),1)));
+        $r->print(&done(undef,$url));
+        return;
     } 
+
+   # Rename the file
     my $chg_access;
     my $result=
 	&Apache::lonnet::renameuserfile($uname,$udom,
@@ -760,18 +814,20 @@ sub rename_confirmed {
     if ($result eq 'ok') {
         $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
     } else {      
-	$r->print('<span class="LC_error">'.
-		  &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
-                      ,$result,&display_file(),&display_file('',$filenewname))
-                  .'</span><br />');
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+                        ,$result,&display_file(),&display_file('',$filenewname))
+                    ,1)));
+        $r->print(&done(undef,$url));
         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(
+        &Apache::loncommon::confirmwrapper(
+            &Apache::lonhtmlcommon::confirm_success(
+                &mt('File successfully renamed'))));
     $r->print(&done(undef,$url));
 }
 
@@ -836,7 +892,13 @@ sub display_access {
     my $aclcount = keys(%access_controls);
     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>';
+        $header =
+            '<h2>'
+            .&mt('Allowing others to retrieve file: [_1]'
+                 ,'<span class="LC_filename">'
+                 .$port_path.$env{'form.currentpath'}.$env{'form.access'}
+                 .'</span>')
+            .'</h2>';
         $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.');
@@ -850,7 +912,7 @@ sub display_access {
         }
         $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
         if ($group ne '') {
-            $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
+            $info .= &mt("Users with course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'<br />';
         }
     } else {
         $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
@@ -881,7 +943,7 @@ 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('The conditions can include affiliation with a particular course or community, 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.');
 }
 
@@ -922,7 +984,7 @@ sub build_access_summary {
                       guest => 'Passphrase-protected',
                       domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',
-                      course => 'Conditional: course-based',
+                      course => 'Conditional: course/community-based',
                      );
     my @allscopes = ('public','guest','domains','users','course');
     foreach my $scope (@allscopes) {
@@ -939,19 +1001,24 @@ sub build_access_summary {
                 $showstart = &mt('Deleted');
                 $showend = $showstart;
             } else {
-                $showstart = localtime($start);
+                $showstart = &Apache::lonlocal::locallocaltime($start);
                 if ($end == 0) {
                     $showend = &mt('No end date');
                 } else {
-                    $showend = localtime($end);
+                    $showend = &Apache::lonlocal::locallocaltime($end);
                 }
             }
             $r->print('<td>'.&mt($scope_desc{$scope}));
+            my $crstype;
             if ($scope eq 'course') {
                 if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);
                     $r->print('<br />('.$course_description{'description'}.')');
+                    $crstype = 'Course';
+                    if ($course_description{'type'} ne '') {
+                        $crstype = $course_description{'type'};
+                    }
                 }
             }
             $r->print('</td><td>'.&mt('Start: ').$showstart.
@@ -971,8 +1038,6 @@ sub build_access_summary {
                         foreach my $item ('role','access','section','group') {
                             $r->print('<td>');
                             if ($item eq 'role') {
-                                my $ucscope = $scope;
-                                $ucscope =~ s/^(\w)/uc($1)/e;
                                 my $role_output;
                                 foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
                                     if ($role eq 'all') {
@@ -980,7 +1045,7 @@ sub build_access_summary {
                                     } elsif ($role =~ /^cr/) {
                                         $role_output .= (split('/',$role))[3].',';
                                     } else {
-                                        $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
+                                        $role_output .= &Apache::lonnet::plaintext($role,$crstype).',';
                                     }
                                 }
                                 $role_output =~ s/,$//;
@@ -1038,8 +1103,8 @@ sub update_access {
         }
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
-              $port_path.$file_name).'</h3>'."\n");
+    $r->print('<h2>'.&mt('Allowing others to retrieve file: [_1]',
+              '<span class="LC_filename">'.$port_path.$file_name.'</span>').'</h2>'."\n");
     $file_name = &prepend_group($file_name);
     my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -1106,26 +1171,37 @@ sub update_access {
     my $totalnew = 0;
     my $status = 'new';
     my ($firstitem,$lastitem);
-    foreach my $newitem ('course','domains','users') {
+    my @types = ('course','domains','users');
+    foreach my $newitem (@types) {
         $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','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>',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
-                $firstitem = $totalnew;
-                $lastitem = $totalnew + $env{'form.new'.$newitem};
-                $totalnew = $lastitem;
-                my @numbers;   
-                for (my $i=$firstitem; $i<$lastitem; $i++) {
-                    push (@numbers,$i);
-                }
-                &display_access_row($r,$status,$newitem,\@numbers,
-                                    $access_controls{$file_name},$now,$then);
+        my %showtypes = (
+           course  => 'course/community',
+           domains => 'domain',
+           users   => 'user',
+        );
+        foreach my $newitem (@types) {
+            next if ($env{'form.new'.$newitem} <= 0);
+            $r->print(
+                '<p>'
+               .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]',
+                    '<b>','</b>',
+                    '<span class="LC_filename"><b>'
+                   .$env{'form.currentpath'}.$env{'form.selectfile'}.'</b></span>')
+               .'</p>');
+            $firstitem = $totalnew;
+            $lastitem = $totalnew + $env{'form.new'.$newitem};
+            $totalnew = $lastitem;
+            my @numbers;   
+            for (my $i=$firstitem; $i<$lastitem; $i++) {
+                push(@numbers,$i);
             }
+            &display_access_row($r,$status,$newitem,\@numbers,
+                                $access_controls{$file_name},$now,$then);
         }
         &close_form($r,$url);
     } else {
@@ -1133,9 +1209,11 @@ sub update_access {
             'currentpath' => $env{'form.currentpath'},
             'access' => $env{'form.selectfile'}
         );
-        $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+        my @actions;
+        push(@actions, &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')));
+        push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory')));
+        $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     }
     return;
 }
@@ -1358,7 +1436,7 @@ sub standard_settings {
         &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(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course/community affiliation.'));
     }
 }
 
@@ -1392,17 +1470,14 @@ sub acl_status {
 
 sub access_element {
     my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
-    my $title = $type;
-    $title =~ s/s$//;
-    $title =~ s/^(\w)/uc($1)/e;
-    $r->print('<h3>'.&mt('[_1]-based conditional access: ',&mt($title)));
+    my %typetext = (
+        domains => 'Domain',
+        users   => 'User',
+        course  => 'Course/Community'
+    );
+    $r->print('<h3>'.&mt($typetext{$type}.'-based conditional access:').' ');
     if ($$acl_count{$type}) {
-        $r->print($$acl_count{$type}.' ');
-        if ($$acl_count{$type} > 1) {
-            $r->print(&mt('conditions'));
-        } else {
-            $r->print(&mt('condition'));
-        }
+        $r->print(&mt('[quant,_1,condition]',$$acl_count{$type}));
     } else {
         $r->print(&mt('Off'));
     }
@@ -1413,17 +1488,27 @@ sub access_element {
 
 sub display_access_row {
     my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
+    my ($showtype, $infotype);
+    if ($type eq 'course') {
+        $showtype = &mt('Courses/Communities');
+        $infotype = 'Course/Community';
+    } elsif ($type eq 'domains') {
+        $showtype = &mt('Domains');
+        $infotype = 'Domain';
+    } elsif ($type eq 'users') {
+        $showtype = &mt('Users');
+        $infotype = 'User';
+    }
     if (@{$items} > 0) {
         my @all_doms;
         my $colspan = 3;
-        my $uctype = $type;
-        $uctype =~ s/^(\w)/uc($1)/e;
         $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());
-        $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
+        $r->print('<th>'.&mt('Action?').'</th><th>'.$showtype.'</th><th>'.
               &mt('Dates available').'</th>');
         if ($type eq 'course' && $status eq 'old') {
-            $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
+            
+            $r->print('<th>'.&mt('Allowed course/community affiliations').
                       '</th>');
             $colspan ++;
         } elsif ($type eq 'domains') {
@@ -1450,8 +1535,12 @@ sub display_access_row {
         }
         $r->print(&Apache::loncommon::end_data_table());
     } else {
-        $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'<br />'
-                  .&additional_item($type));
+        $r->print(
+            '<p class="LC_info">'
+           .&mt('No '.$infotype.'-based conditions defined')
+           .'</p>'
+           .&additional_item($type)
+        );
     }
     return;
 }
@@ -1459,6 +1548,7 @@ sub display_access_row {
 sub course_js {
     return qq|
 <script type="text/javascript">
+// <![CDATA[
 function setRoleOptions(num,roleid,cdom,cnum,type) {
     updateIndexNum = getIndexByValue('update',num);
     var addItem = 'add_role_'+num;
@@ -1498,6 +1588,7 @@ function getIndexByValue(name,value) {
     return -1;
 }
 
+// ]]>
 </script>
 |;
 }
@@ -1512,17 +1603,20 @@ sub course_row {
     }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
 	.&course_js();
-    my $uctype = $type;
-    $uctype =~ s/^(\w)/uc($1)/e;
+    my $showtype = &mt('Course/Community');
+    my $crstype = 'Course';
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     $type);
     $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
     if ($status eq 'old') {
         my $cid = $content->{'domain'}.'_'.$content->{'number'};
         my %course_description = &Apache::lonnet::coursedescription($cid);
+        if ($course_description{'type'} ne '') {
+            $crstype = $course_description{'type'};
+        }
         $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {
-        $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
+        $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
     }
     $r->print('<td>'.&dateboxes($num,$start,$end));
     my $newrole_id = 1;
@@ -1540,16 +1634,16 @@ sub course_row {
                     $max_id = $role_id;
                 }
                 $max_id ++;
-                my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
+                my $role_selects = &role_selectors($num,$role_id,$crstype,$content,'display');
                 $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
             }
             $r->print('</table>');
         }
         $r->print('<br />'.&mt('Add a roles-based condition').
                   '&nbsp;<input type="checkbox" name="add_role_'.
-                  $num.'" onClick="javascript:setRoleOptions('."'$num',
+                  $num.'" onclick="javascript:setRoleOptions('."'$num',
                   '$max_id','$content->{'domain'}','$content->{'number'}',
-                  '$uctype'".')" value="" />');
+                  '$showtype'".')" value="" />');
         $newrole_id = $max_id;
     } else {
         $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />');
@@ -1610,8 +1704,18 @@ sub users_row {
 
 sub additional_item {
     my ($type) = @_;
-    my $output = &mt('Add new [_1] condition(s)?',&mt($type)).'&nbsp;'.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
-    return $output;
+    my $showtype;
+    if ($type eq 'course') {
+        $showtype = 'course/community';
+    } elsif ($type eq 'domains') {
+        $showtype = 'domain';
+    } elsif ($type eq 'users') {
+        $showtype = 'user';
+    }
+    return
+        &mt('Add new '.$showtype.'-based condition(s)?')
+       .'&nbsp;'.&mt('Number to add: ')
+       .'<input type="text" name="new'.$type.'" size="3" value="0" />';
 }
 
 sub actionbox {
@@ -1681,10 +1785,12 @@ sub role_selectors {
          $cdom = $env{'form.cdom'};
          $cnum = $env{'form.cnum'};
     }
-    my $uctype = $type;
-    $uctype =~ s/^(\w)/uc($1)/e;
+    my $crstype = 'Course';
+    if ($cnum =~ /^$match_community$/) {
+        $crstype = 'Community'
+    }
     my ($sections,$groups,$allroles,$rolehash,$accesshash) =
-            &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype);
+            &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$crstype);
     if (!@{$sections}) {
         @{$sections} = ('none');
     } else {
@@ -1779,19 +1885,45 @@ function getIndexByName(item) {
 
 </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('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+    $r->print(
+        '<p>'
+       .&mt('Select roles, '.lc($type).' status, section(s) and group(s) for users'
+           .' who will be able to access the portfolio file.')
+       .'</p>'
+    );
+    $r->print(
+        '<form name="rolepicker" action="/adm/portfolio" method="post">'
+       .'<table><tr>'
+       .'<th>'.&mt('Roles').'</th>'
+       .'<th>'.&mt("$type status").'</th>'
+       .'<th>'.&mt('Sections').'</th>'
+       .'<th>'.&mt('Groups').'</th>'
+       .'</tr><tr>'.$role_selects.'</tr>'
+       .'</table><br />'
+       .'<input type="button" name="rolepickbutton" value="'.&mt('Save').'" onclick="setRoles()" />'
+    );
     return;
 }
 
 sub select_files {
-    my ($r) = @_;
+    my ($r,$dir_list) = @_;
     if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . . 
         my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
         if (scalar(@items)){
-             &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+            my @ok_items;
+            if (ref($dir_list) eq 'ARRAY') {
+                foreach my $dir_line (@{$dir_list}) {
+                    my ($filename,undef,undef,undef,undef,undef,undef,undef,$size)=split(/\&/,$dir_line,10);
+                    if (grep(/^\Q$filename\E$/,@items)) {
+                        if ($size) {
+                            push(@ok_items,$filename); 
+                        }
+                    }
+                }
+            }
+            &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @ok_items);
         }
     } else {
             #empty the file for a fresh start
@@ -1844,111 +1976,293 @@ ENDSMP
     );
 }
 
-
-sub check_for_upload {
-    my ($path,$fname,$group,$element) = @_;
-    my $disk_quota = &get_quota($group);
-    my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
-    my $portfolio_root = &get_portfolio_root();
-    my $port_path = &get_port_path();
-    my ($uname,$udom) = &get_name_dom($group);
-    # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&get_dir_list($portfolio_root,$path,$group);
-    my $found_file = 0;
-    my $locked_file = 0;
-    foreach my $line (@dir_list) {
-        my ($file_name)=split(/\&/,$line,2);
-        if ($file_name eq $fname){
-            $file_name = $path.$file_name;
-            $file_name = &prepend_group($file_name);
-            $found_file = 1;
-            if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-                $locked_file = 1;
-            } 
-        }
-    }
-    my $getpropath = 1;
-    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-
-    if (($current_disk_usage + $filesize) > $disk_quota){
-        my $msg = '<span class="LC_error">'.
-                &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
-                  '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
-	return ('will_exceed_quota',$msg);
-    } elsif ($found_file) {
-        if ($locked_file) {
-            my $msg = '<span class="LC_error">';
-            $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
-            $msg .= '</span><br />';
-            $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
-	    return ('file_locked',$msg);
-	} else {
-            my $msg = '<span class="LC_error">';
-            $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
-            $msg .= '</span>';
-            $msg .= '<br />';
-            $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
-	    return ('file_exists',$msg);
-	}
-    }
-}
-
 sub upload {
     my ($r,$url,$group)=@_;
-    my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
+    my $formname = 'uploaddoc';
+    my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
+    my ($state,$msg);
+    if ($fname eq '') {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+                      'so after eliminating special characters there was nothing left.',
+                      '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>'),1)));
+
+        $r->print(&done(undef,$url));
+        return;
+    }
     my $disk_quota = &get_quota($group);
     my $portfolio_root = &get_portfolio_root();
     my $port_path = &get_port_path();
     my ($uname,$udom) = &get_name_dom($group);
     my $getpropath = 1;
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-    my ($state,$msg) = 
+    ($state,$msg) = 
         &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
-		                             $group,'uploaddoc',$portfolio_root,
+		                             $group,$formname,$portfolio_root,
                                              $port_path,$disk_quota,
                                              $current_disk_usage,$uname,$udom);
     if ($state eq 'will_exceed_quota'
 	|| $state eq 'file_locked'
-	|| $state eq 'file_exists' ) {
-	$r->print($msg.&done('Back',$url));
+        || $state eq 'zero_bytes') {
+	$r->print($msg.&done(undef,$url));
 	return;
     }
 
-    my (%allfiles,%codebase,$mode);
-    if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
+    my (%allfiles,%codebase,$mode,$mimetype);
+    if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
         if ($env{'form.parserflag'}) {
 	    $mode = 'parse';
         }
     }
+    my $context;
+    if ($state eq 'existingfile') {
+        $context = $state;
+    }
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
+    my ($result,$timestamp) =
+	&Apache::lonnet::userfileupload($formname,$context,$subdir,
+					$mode,\%allfiles,\%codebase,undef,undef,
+                                        undef,undef,undef,undef,\$mimetype);
+    if ($state eq 'existingfile') {
+        my $group_elem;
+        my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites';
+        if ($group eq '') {
+            $rootdir .= '/'.$env{'user.domain'}.'/'.$env{'user.name'};
+        } else {
+            $rootdir .= '/'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
+                        '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
+            $group_elem = '<input type="hidden" name="group" value="'.$group.'" />';
+        }
+        if (($result eq $rootdir.'/'.$port_path.$env{'form.currentpath'}.$fname) && ($timestamp =~ /^\d+$/)) {
+            my $showfname = &HTML::Entities::encode($fname,'&<>"');
+            my %lt = &Apache::lonlocal::texthash (
+                                                   over => 'Overwrite existing file?',
+                                                   yes  => 'Yes',
+                                                   no   => 'No',
+                                                   undo => 'This action can not be undone.',
+                                                   conf => 'Are you sure you want to overwrite an existing file?',
+                                                   cont => 'Continue',
+                                                 );
+            my $parserflag;
+            my $hidden = &hidden_elems();
+            if ($mode eq 'parse') {
+                $parserflag = '<input type="hidden" name="parserflag" value="1" />';
+            }
+            $r->print(<<"END");
+<script type="text/javascript">
+// <![CDATA[
+function confirmOverwrite() {
+    var chosen;
+    if (document.existingfile.overwrite.length) {
+        for (var i=0; i<document.existingfile.overwrite.length; i++) {
+            if (document.existingfile.overwrite[i].checked) {
+                chosen = document.existingfile.overwrite[i].value;
+            }
+        }
+    }
+    if (chosen == 1) {
+        if (confirm('$lt{'conf'}')) {
+            document.existingfile.action.value = "process_overwrite";
+            return true;
+        } else {
+            document.existingfile.action.value = "cancel_overwrite";
+            if (document.existingfile.overwrite.length) {
+                for (var i=0; i<document.existingfile.overwrite.length; i++) {
+                    if (document.existingfile.overwrite[i].value == "0") {
+                        document.existingfile.overwrite[i].checked = true;
+                    }
+                }
+            }
+            return false;
+        }
+    } else {
+        document.existingfile.action.value = "cancel_overwrite";
+        return true;
+    }
+}
+// ]]>
+</script>
+<p>
+$msg
+</p>
+<form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
+<p class="LC_nobreak">$lt{'over'}
+<label><input type="radio" name="overwrite" value="1" />
+$lt{'yes'}</label>&nbsp;
+<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></p>
+<p>
+<input type="hidden" name="action" value="cancel_overwrite" />
+<input type="hidden" name="filename" value="$showfname" />
+<input type="hidden" name="timestamp" value="$timestamp" />
+$hidden
+$parserflag
+$group_elem
+<input type="submit" name="process" value="$lt{'cont'}" />
+</p>
+</form>
+END
+        } else {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred ([_1]) while trying to upload [_2].'
+                        ,$result,&display_file(undef,$fname)),1)));
+            $r->print(&done(undef,$url));
+        }
+    } elsif ($result !~ m|^/uploaded/|) {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred ([_1]) while trying to upload [_2].'
+                        ,$result,&display_file(undef,$fname)),1)));
+	$r->print(&done(undef,$url));
+    } else {
+        if (!&suppress_embed_prompt()) {
+            if ($mimetype eq 'text/html') {
+	        if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+	        } else {
+                    $r->print('<p class="LC_warning">'.&mt('No embedded items identified.').'</p>');
+                }
+            }
+        }
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('File successfully uploaded'))));
+	$r->print(&done(undef,$url));
+    }
+    return;
+}
+
+sub hidden_elems {
+    my $contelem;
+    if ($env{'form.mode'} eq 'selectfile') {
+        $contelem = '<input type="hidden" name="continue" value="true" />';
+    }
+    return <<END;
+<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="symb" value="$env{'form.symb'}" />
+<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
+<input type="hidden" name="showversions" value="$env{'form.showversions'}" />
+$contelem
+END
+}
+
+sub print_dependency_form {
+    my ($r,$url,$allfiles,$codebase,$result) = @_;
+    my $container = &HTML::Entities::encode($result,'<>"&');
+    my $state = &embedded_form_elems($container);
+    my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
+                                  {'error_on_invalid_names'   => 1,
+                                   'ignore_remote_references' => 1,});
+    if ($embedded) {
+        if ($num || $pathchg) {
+            $r->print('<h3>'.&mt("Reference Warning").'</h3>');
+        } else {
+            $r->print('<h3>'.&mt("Reference Information").'</h3>');
+        }
+        if ($num) {
+            $r->print('<p>'.&mt('Completed upload of the file.').' '.
+                      &mt('This file contained references to other files.').' '.
+                      &mt('You must upload the referenced files or else the uploaded file may not work properly.').
+                      '</p>'.
+                      '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
+                       $embedded.
+                       '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
+        } else {
+            $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files.").'</p>'.
+                      $embedded.
+                      '<p>'.&done('Return to directory',$url).'</p>');
+        }
+    } else {
+        $r->print(&done(undef,$url));
+    }
+    return;
+}
+
+sub overwrite {
+    my ($r,$url,$group)=@_;
+    my $formname = 'existingfile';
+    my $port_path = &get_port_path();
+    my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+    my (%allfiles,%codebase,$mode,$mimetype);
+    unless (&suppress_embed_prompt()) {
+        if ($env{'form.parserflag'}) {
+            if ($fname =~ /\.s?html?$/i) {
+                $mode = 'parse';
+            }
+        }
+    }
+    if ($fname eq '') {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+                      'so after eliminating special characters there was nothing left.',
+                      '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
+        $r->print(&done(undef,$url));
+        return;
+    }
+    $env{'form.'.$formname.'.filename'} = $fname;
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
     my $result=
-	&Apache::lonnet::userfileupload('uploaddoc','',
-					$port_path.$env{'form.currentpath'},
-					$mode,\%allfiles,\%codebase);
+        &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode,
+                                        \%allfiles,\%codebase,undef,undef,undef,
+                                        undef,undef,undef,\$mimetype);
     if ($result !~ m|^/uploaded/|) {
-	$r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
-                  ,$result,&display_file()).'</span><br />');
-	$r->print(&done('Back',$url));
-    } else {
-	if (%allfiles) {
-            if (!&suppress_embed_prompt()) {
-	        my $state = <<STATE;
-    <input type="hidden" name="action"      value="upload_embedded" />
-    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
-    <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
-    <input type="hidden" name="mode"        value="$env{'form.mode'}" />
-STATE
-                $r->print("<h2>".&mt("Reference Warning")."</h2>");
-                $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
-                $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
-	        $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
-				      {'error_on_invalid_names'   => 1,
-				       'ignore_remote_references' => 1,}));
-	        $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+                       ,$result,&display_file(undef,$fname)),1)));
+    } else {
+        if ($mode eq 'parse') {
+            if ($mimetype eq 'text/html') {
+                if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+                } else {
+                    $r->print(
+                        &Apache::loncommon::confirmwrapper(
+                            &Apache::lonhtmlcommon::confirm_success(
+                                &mt('Overwriting completed.'))
+                           .'<br />'.&mt('No embedded items identified.')));
+                }
             }
-	} else {
-	    $r->print(&done(undef,$url));
-	}
+        } else {
+            $r->print(
+                &Apache::loncommon::confirmwrapper(
+                    &Apache::lonhtmlcommon::confirm_success(
+                        &mt('Overwriting completed.'))));
+        }
+    }
+
+    my $group_elem;
+    if (defined($env{'form.group'})) {
+        $group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
+        if (defined($env{'form.ref'})) {
+            $group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
+        }
     }
+    my $hidden = &hidden_elems();
+    $r->print(
+        &Apache::lonhtmlcommon::actionbox(
+            ['<a href="javascript:document.overwritedone.submit();">'
+            .&mt('Return to directory')
+            .'</a>'])
+       .'<form name="overwritedone" method="post" action="'.$url.'">'
+       .$hidden
+       .$group_elem
+       .'</form>'
+    );
+    return;
 }
 
 sub lock_info {
@@ -1967,7 +2281,7 @@ sub lock_info {
 		$filetext = '<strong>'.$env{'form.lockinfo'}.
 		    '</strong> (group: '.$group.')'; 
 	    } else {
-		$filetext = '<strong>'.$file_name.'</strong>';
+		$filetext = '<span class="LC_filename">'.$file_name.'</span>';
 	    } 
 	    
 	    my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
@@ -1990,49 +2304,73 @@ sub lock_info {
 	    }
         }
     }
-    $r->print(&done(&mt('Back'),$url));
+    $r->print(&done(undef,$url));
     return 'ok';
 }
 
 sub createdir {
     my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
+    # Display warning in case of directory name cleaning has changed the directory name
+    if ($newdir ne $env{'form.newdir'}) {
+        $r->print(
+            '<p><span class="LC_warning">'
+           .&mt('Invalid characters')
+           .'</span><br />'
+           .&mt('The new directory name was changed from [_1] to [_2].'
+                      ,'<span class="LC_filename">'.$env{'form.newdir'}.'</span>'
+                      ,'<span class="LC_filename">'.$newdir.'</span>')
+           .'</p>'
+        );
+    }
+
+    # Directory name empty?
     if ($newdir eq '') {
-    	$r->print('<span class="LC_error">'.
-	    	  &mt("Error: no directory name was provided.").
-		      '</span><br />');
-	    $r->print(&done(undef,$url));
-	    return;
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Error: no directory name was provided.'),1)));
+            $r->print(&done(undef,$url));
+            return;
     }
+
     my $portfolio_root = &get_portfolio_root(); 
-    my @dir_list=&get_dir_list($portfolio_root,undef,$group);
+    my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
     my $found_file = 0;
-    foreach my $line (@dir_list) {
-        my ($filename)=split(/\&/,$line,2);
-        if ($filename eq $newdir){
-            $found_file = 1;
+    if (ref($dirlistref) eq 'ARRAY') {
+        foreach my $line (@{$dirlistref}) {
+            my ($filename)=split(/\&/,$line,2);
+            if ($filename eq $newdir){
+                $found_file = 1;
+            }
         }
     }
-    if ($found_file){
-    	    $r->print('<span class="LC_error">'
-                      .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')
-                      .' '.&mt('A file or directory by that name already exists.').'</span><br />');
+    if ($found_file) {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Unable to create a directory named [_1].'
+                        ,'<span class="LC_filename">'.$newdir.'</span>'),1)
+               .'<br />'.&mt('A file or directory by that name already exists.')));
     } else {
         my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path();
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
 	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
-    	    $r->print('<span class="LC_error">'
-                      .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
-                           ,$result,&display_file())
-                      .'</span><br />');
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+                        ,$result,&display_file()),1)));
+
+        } else {
+        $r->print(
+            &Apache::loncommon::confirmwrapper(
+                &Apache::lonhtmlcommon::confirm_success(
+                    &mt('Directory successfully created'))));
         }
     }
-    if ($newdir ne $env{'form.newdir'}) {
-        $r->print(&mt('The new directory name was changed from [_1] to [_2].'
-                      ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));  
-    }
     $r->print(&done(undef,$url));
 }
 
@@ -2062,7 +2400,7 @@ sub get_group_quota {
     if (%curr_groups) {
         my %group_info =  &Apache::longroup::get_group_settings(
                                                     $curr_groups{$group});
-        $group_quota = $group_info{'quota'}; #expressed in Mb
+        $group_quota = $group_info{'quota'}; #expressed in MB
         if ($group_quota) {
             $group_quota = 1000 * $group_quota; #expressed in k
         }
@@ -2120,12 +2458,13 @@ sub get_port_path {
 
 sub missing_priv {
     my ($r,$url,$priv) = @_;
-    my $longtext = {
+    my %longtext = 
+        &Apache::lonlocal::texthash(
                       upload => 'upload files',
                       delete => 'delete files',
                       rename => 'rename files',
                       setacl => 'set access controls for files',
-                   };
+    );
     my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
     my $rtnlink = '<a href="'.$url;
     if ($url =~ /\?/) {
@@ -2135,17 +2474,16 @@ sub missing_priv {
     }
     $rtnlink .= 'currentpath='.$escpath;
     $r->print('<h3>'.&mt('Action disallowed').'</h3>');
-    $r->print(&mt('You do not have sufficient privileges to [_1] ',
-                  $longtext->{$priv}));
+    $r->print(&mt('You do not have sufficient privileges to [_1]',
+                  $longtext{$priv}));
     if (defined($env{'form.group'})) {
-        $r->print(&mt("in the group's group portfolio."));
+        $r->print(' '.&mt("in the group's group portfolio."));
         $rtnlink .= &group_args()
     } else {
-        $r->print(&mt('in this portfolio.'));
+        $r->print(' '.&mt('in this portfolio.'));
     }
     $rtnlink .= '">'.&mt('Return to directory').'</a>';
     $r->print('<br />'.$rtnlink);
-    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -2184,8 +2522,8 @@ sub get_quota {
         }
     } else {
         $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
-                                    $env{'user.domain'}); #expressed in Mb
-        $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+                                    $env{'user.domain'}); #expressed in MB
+        $disk_quota = 1000 * $disk_quota; # convert from MB to kB
     }
     return $disk_quota;
 }
@@ -2200,6 +2538,20 @@ sub suppress_embed_prompt {
     return $suppress_prompt;
 }
 
+sub embedded_form_elems {
+    my ($container) = @_;
+    my $state = <<STATE;
+    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+    <input type="hidden" name="symb" value="$env{'form.symb'}" />
+    <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+    <input type="hidden" name="mode" value="$env{'form.mode'}" />
+    <input type="hidden" name="container" value="$container" />
+STATE
+    if ($env{'form.group'} ne '') {
+        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+    }
+    return $state;
+}
 
 sub handler {
     # this handles file management
@@ -2207,7 +2559,7 @@ 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','showversions','ref']);
+          'cnum','cdom','type','setroles','showversions','ref','symb']);
     my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
@@ -2274,7 +2626,7 @@ sub handler {
     } else {
         ($uname,$udom) = &get_name_dom();
         $portfolio_root = &get_portfolio_root();
-        $title = &mt('My Space');
+        $title = 'My Space';
         $can_modify = 1;
         $can_delete = 1;
         $can_upload = 1;
@@ -2310,43 +2662,93 @@ sub handler {
         }
     }
     $r->rflush();
+    # Check if access to portfolio is blocked by one or more blocking events in courses.
     my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);
     if ($blocked) {
-         $r->print($blocktext);
-         $r->print(&Apache::loncommon::end_page());
-         return OK;
-    }
-	if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
-   	    $r->print('<span class="LC_error">');
-   	    $r->print(&mt('No file was selected to upload.').' ');
-	    $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
-	    $r->print('</span>');
-	}
+        my $evade_block;
+        # If portfolio display is in a window popped up from a "Select Portfolio Files"
+        # link in a .task resource, check if access to the task included proctor validation
+        # of check-in to a slot limited by IP.
+        # If so, and the slot is between its open and close dates, override the block. 
+        if ($env{'request.course.id'} && $env{'form.symb'}) {
+            (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+            if ($res =~ /\.task$/i) {
+                my %history =
+                    &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
+                                             $env{'user.domain'},$env{'user.name'});
+                my $version = $history{'resource.0.version'};
+                if ($history{'resource.'.$version.'.0.checkedin'}) {
+                    if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
+                        my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
+                        if ($slot{'ip'}) {
+                            if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
+                                my $now = time;
+                                if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
+                                    $evade_block = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        unless ($evade_block) {
+            $r->print($blocktext);
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
+    }
+    if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
+   	$r->print(
+            '<p><span class="LC_warning">'
+           .&mt('No file was selected to upload.')
+           .'</span><br />'
+           .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
+                ,'<strong>','</strong>')
+           .'</p>'
+        );
+    }
     if ($env{'form.meta'}) {
         &open_form($r,$url);
-        $r->print(&mt('Edit the meta data').'<br />');
+        $r->print(&mt('Edit Metadata').'<br />');
         &close_form($r,$url);
     }
-    if ($env{'form.store'}) {
-    }
-
     if ($env{'form.uploaddoc.filename'}) {
         if ($can_upload) {
 	    &upload($r,$url,$group);
         } else {
             &missing_priv($r,$url,'upload');
         }
+    } elsif ($env{'form.action'} eq 'process_overwrite') {
+        if ($can_upload) {
+            &overwrite($r,$url,$group);
+        } else {
+            &missing_priv($r,$url,'existingfile');
+        }
     } elsif ($env{'form.action'} eq 'upload_embedded') {
 	if ($can_upload) {
             my $disk_quota = &get_quota($group);
             my $getpropath = 1;
             my $current_disk_usage = 
                 &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-	    $r->print(
+            my $container = &HTML::Entities::encode($env{'form.container'},'<>&"');
+            my $state = &embedded_form_elems($container).
+                        '<input type="hidden" name="action" value="modify_orightml" />';
+	    my ($result,$flag) =
                 &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
-                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
-            $r->print(&done(undef,$url));
+                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url);
+            $r->print($result.&done('Return to directory',$url));
+        } else {
+            &missing_priv($r,$url,'upload');
+        }
+    } elsif ($env{'form.action'} eq 'modify_orightml') {
+        if ($can_upload) {
+            my $result = 
+                &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+                                                     $udom,$portfolio_root);
+            $r->print($result.
+                      &done('Return to directory',$url));
         } else {
             &missing_priv($r,$url,'upload');
         }
@@ -2416,6 +2818,16 @@ sub handler {
     } elsif ($env{'form.lockinfo'}) {
         &lock_info($r,$url,$group);
     } else {
+        if ($env{'form.action'} eq 'cancel_overwrite') {
+            if ($can_upload) {
+                my $formname = 'existingfile';
+                my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+                $env{'form.'.$formname.'.filename'} = $fname;
+                my $subdir = $port_path.$env{'form.currentpath'};
+                $subdir =~ s{(/)$}{};
+                &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir);
+            }
+        }
 	my $current_path='/';
 	if ($env{'form.currentpath'}) {
 	    $current_path = $env{'form.currentpath'};
@@ -2424,8 +2836,9 @@ sub handler {
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
         }
-        my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
-	if ($dir_list[0] eq 'no_such_dir'){
+        my ($dirlistref,$listerror) =
+            &get_dir_list($portfolio_root,$current_path,$group);
+	if ($listerror 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
@@ -2440,16 +2853,25 @@ sub handler {
 		$current_path = '/'; # force it back to the root        
 	    }
 	    # now grab the directory list again, for the first time
-            @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
+            ($dirlistref,$listerror) =
+                &get_dir_list($portfolio_root,$current_path,$group);
         }
 	# need to know if directory is empty so it can be removed if desired
-	my $is_empty=(@dir_list == 2);
-	&display_common($r,$url,$current_path,$is_empty,\@dir_list,
+        my $is_empty;
+        if ($listerror eq 'empty') {
+            $is_empty = 1;
+        } elsif (ref($dirlistref) eq 'ARRAY') {
+            if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/)
+                && ($dirlistref->[1] =~ /^\.+\&/))  {
+                $is_empty = 1;
+            }
+        }
+	&display_common($r,$url,$current_path,$is_empty,$dirlistref,
 			$can_upload,$group);
-        &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
+        &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);
-	$r->print(&Apache::loncommon::end_page());
     }
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }