--- loncom/interface/portfolio.pm	2004/08/24 06:51:11	1.26
+++ loncom/interface/portfolio.pm	2004/12/04 02:15:42	1.60
@@ -33,141 +33,22 @@ use Apache::lonlocal;
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($filename, $current_path) = @_;
-    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';
+    my ($filename, $current_path, $current_mode, $field_name) = @_;
+    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
     return $anchor;
 }
-
-# returns html with <br /> separated contents of the directory
-# returns a <strong>currentFile</strong> (bolds the selected file/dir)
-sub display_directory_old {
-    my ($currentPath, $currentFile, @dirList,) = @_;
-    my $displayOut='';  
-    my $filename;
-    my $upPath;
-    if ($currentPath ne '/') {
-        $displayOut = 'Listing of '.$currentPath.'<br /><hr />';
-        # provides the "up one directory level" function
-        # it means shortening the currentpath to the parent directory
-        $currentPath =~ m:(^/.*)(/.*/$):;
-        if ($1 ne '/') {
-            $upPath = $1.'/';
-        } else {
-            $upPath = $1;
-        }
-        
-        # $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';
-    } else {
-        # $displayOut = $displayOut.'at root '.$currentPath.'<br />';
-    }
-    foreach my $line (@dirList) {
-    	#$strip holds directory/file name
-    	#$dom 
-    	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
-        if (($filename ne '.') && ($filename ne '..')) {
-            if ($testdir =~ m:^1:) {
-                # handle directories different from files
-                if ($filename eq $currentFile) {
-		    #checks to bold the selected file
-                    $displayOut.= '<strong>'.(&make_anchor($filename.'/', $filename.'/').'</strong><br />'."\n");
-                } else {
-                    $displayOut.= (&make_anchor($filename.'/', $filename.'/').'<br />'."\n");
-                }
-            } else {
-                if ($filename eq $currentFile) {
-		    #checks to bold the selected file
-                    $displayOut.='<strong>'.(&make_anchor($filename, $currentPath).'</strong><br />'."\n");
-                } else {
-                    $displayOut.=(&make_anchor($filename, $currentPath).'<br />'."\n");
-                }
-            }
-            
-        }
-    	
-    }
-    return $displayOut;
-}
-
-sub displayActions {
-    # returns html to offer user appropriate actions depending on selected file/directory
-    my $displayOut;
-    my ($currentPath, $currentFile, $isEmpty) = @_;
-#   $displayOut = 'here are actions for '.$currentFile;
-    if ($currentFile =~ m:/$:) {
-        # if the selected file is a directory, these are the options
-        # offer the chance to delete the directory only if it is empty
-        if ($isEmpty && ($currentPath ne '/')) {
-            $displayOut =   $displayOut.'<form method="POST">
-            <input type="hidden" name="selectfile" 
-            value="'.$currentFile.'" />
-            <input type="hidden" name="fileaction" value="delete" /> 
-            <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
-            <center>
-            <input type="submit" 
-            value="Delete '.$currentFile.'" />
-            </center>
-            </form>';
-        } 
-        if ($currentPath ne '/') {
-            $displayOut = $displayOut.'<hr />
-            <form method="POST">
-            <input type="hidden" name="selectfile" 
-            value="'.$currentFile.'" />
-            <input type="hidden" name="fileaction" value="rename" /> 
-            <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
-            <input type="input" name="filenewname" value="Type new name here" /> 
-            <input type="submit" 
-            value="Rename '.$currentFile.'" />
-            </form>';
-        }
-    } else {  #action options offered for files
-        $displayOut = $displayOut.'<form method="POST">';
-        $displayOut = $displayOut.'<input type="hidden" name="selectfile"';
-        $displayOut = $displayOut.'value="'.$currentFile;
-        $displayOut = $displayOut.'" /><input type="hidden" name="fileaction" value="delete" /> 
-        <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
-        <center>
-        <input type="submit"
-        value="Delete '.$currentFile.'" />
-        </center>
-        </form>';
-    
-        $displayOut = $displayOut.'<hr />
-        <form method="POST">
-        <input type="hidden" name="selectfile" 
-        value="'.$currentFile.'" />
-        <input type="hidden" name="fileaction" value="rename" /> 
-        <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
-        <input type="input" name="filenewname" value="Type new name here" /> 
-        <input type="submit" 
-        value="Rename '.$currentFile.'" />
-        </form>
-        <hr />';
-    }
-    $displayOut = $displayOut.'<hr />Add a file to '.$currentPath;
-    # file upload form 
-    $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';
-    $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
-        '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.
-        '<input type="submit" name="storeupl" value="Upload" />'.
-        '</form><hr />';
-    $displayOut = $displayOut.'<form method="POST">
-        <input name="subdir" type="text" />
-        <input type="submit" value="Create Subdirectory" />
-        </form>
-            ';
-    return $displayOut;
-}
-
 my $dirptr=16384;
-sub display_directory {
-    my ($r,$current_path,$dir_list)=@_;
+sub display_common {
+    my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');
     my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
+    $displayOut .= '<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="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
+        '<input type="hidden" name="mode" value="'.$ENV{"form.mode"}.'" />'. 
         '<input type="submit" name="storeupl" value="Upload" />'.
         '</form>';
     $r->print($displayOut);
@@ -175,28 +56,53 @@ sub display_directory {
     $displayOut = '<form method="post">';
     $displayOut .= '<input name="newdir" type="input" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '<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="'.&mt("Create Directory").'" />'.
         '</form>';
     $r->print($displayOut);
     $r->print('</td></tr></table>');
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('/','/'));
+    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
         }
     }
     $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
-    $r->print('<br /><form method=post action="/adm/portfolio">'.
+    $r->print('<br /><form method=post action="/adm/portfolio?mode='.$ENV{"form.mode"}.'&fieldname='.$ENV{"form.fieldname"}.'">'.
 	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
+}
+sub display_directory {
+    my ($r,$current_path,$is_empty,$dir_list)=@_;
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $display_out;
+    my %locked_files=&Apache::lonnet::dump('file_permissions',
+                                  $ENV{'user.domain'},$ENV{'user.name'});
+    my $locked_file;
+    foreach my $key (keys %locked_files) {
+        $locked_file .= $locked_files{$key}.':';
+    }
+    if ($is_empty && ($current_path ne '/')) {
+        $display_out = '<form method="post" action="/adm/portfolio">'.
+        '<input type="hidden" name="action" value="deletedir" />'.
+        '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+        '<input type="hidden" name="selectfile" value="" />'.
+        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+        '</form>';
+        
+        $r->print($display_out);
+	return;
+    }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
-    my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/";
+    my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -206,29 +112,36 @@ sub display_directory {
     	#$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); 
+    	if ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){
+    	    &Apache::lonnet::logthis("found submitted file");
+    	    &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+    	} else {
+    	    &Apache::lonnet::logthis("$filename not found submitted file");
+    	    &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+    	}
     	if (($filename ne '.') && ($filename ne '..')) {
             if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                 $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>'); 
+                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
                 $r->print('</tr>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>
-<form method="post" action="/adm/portfolio">
-<select name="action">
-  <option value=""></option>
-  <option value="delete">'.&mt("Delete").'</option>
-  <option value="rename">'.&mt("Rename").'</option>
-</select>
-<input type="submit" name="doit" value="Go" />
-<input type="hidden" name="selectfile" value="'.$filename.'" />
-<input type="hidden" name="currentpath" value="'.$current_path.'" />
-</form>
-</td>');
+                    <form method="post" action="/adm/portfolio">
+                    <select name="action">
+                        <option value=""></option>
+                        <option value="delete">'.&mt("Delete").'</option>
+                        <option value="rename">'.&mt("Rename").'</option>
+                    </select>
+                    <input type="submit" name="doit" value="Go" />
+                    <input type="hidden" name="selectfile" value="'.$filename.'" />
+                    <input type="hidden" name="currentpath" value="'.$current_path.'" />
+                    </form>
+                    </td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.
-			  $filename.'</a></td>'); 
+			    $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                 $r->print('</tr>'); 
@@ -242,6 +155,65 @@ sub display_directory {
 #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     $r->print('</table></form>');
 }
+sub display_file_select {
+    my ($r,$current_path,$is_empty,$dir_list)=@_;
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $display_out;
+    my %checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+    if ($is_empty && ($current_path ne '/')) {
+        $display_out = '<form method="post" action="/adm/portfolio">'.
+        '<input type="hidden" name="action" value="deletedir" />'.
+        '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+        '<input type="hidden" name="selectfile" value="" />'.
+        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+
+        '</form>';
+        
+        $r->print($display_out);
+	return;
+    }
+    $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+    my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+    $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+    foreach my $line (sort 
+		      { 
+			  my ($afile)=split('&',$a,2);
+			  my ($bfile)=split('&',$b,2);
+			  return (lc($afile) cmp lc($bfile));
+		      } (@$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); 
+    	if (($filename ne '.') && ($filename ne '..')) {
+            if ($dirptr&$testdir) {
+                $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+                $r->print('<td>Go to ...</td>');
+                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>'); 
+                $r->print('</tr>'); 
+            } else {
+                $r->print('<tr bgcolor="#CCCCFF">');
+                $r->print('<td>
+                        <input type="checkbox" name="selectedfile" value="'.$filename.'" >
+                    </td>');
+                $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+                $r->print('<td><a href="'.$href_location.$filename.'">'.
+			    $filename.'</a></td>'); 
+                $r->print('<td>'.$size.'</td>');
+                $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+                $r->print('</tr>'); 
+            }
+        }
+    }
+    $r->print('</table>
+            <input type="hidden" name="continue" value="true">
+            <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
+            <input type="hidden" name="mode" value="selectfile">
+            <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
+            <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+            <input type="hidden" name="currentpath" value="'.$current_path.'" />
+    </form>');
+}
 
 sub open_form {
     my ($r)=@_;
@@ -269,19 +241,32 @@ sub close_form {
 }
 
 sub display_file {
-    return $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+    my ($path,$filename)=@_;
+    if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
+    if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
+    return '<tt>'.$path.$filename.'</tt>';
 }
 
 sub done {
     return ('<h3><a href="/adm/portfolio?currentpath='.
-	    $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+	    $ENV{'form.currentpath'}.
+	    '&fieldname='.$ENV{'form.fieldname'}.
+	    '&mode='.$ENV{'form.mode'}.
+	    '">'.&mt('Done').'</a></h3>');
 }
 
 sub delete {
     my ($r)=@_;
-    &open_form($r);
-    $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
-    &close_form($r);
+    my @check;
+    my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+    if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
+        $r->print ("The file is locked and cannot be deleted.<br />");
+        $r->print(&done());
+    } else {
+        &open_form($r);
+        $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+        &close_form($r);
+    }
 } 
 
 sub delete_confirmed {
@@ -291,46 +276,188 @@ sub delete_confirmed {
 					       $ENV{'form.currentpath'}.
 					       $ENV{'form.selectfile'});
     if ($result ne 'ok') {
-	$r->print('<font color="red"> An errror occured ('.$result.
+	$r->print('<font color="red"> An error occured ('.$result.
 		  ') while trying to delete '.&display_file().'</font><br />');
     }
     $r->print(&done());
 }
 
-sub rename {
+sub delete_dir {
     my ($r)=@_;
     &open_form($r);
-    $r->print('<p>'.&mt('Rename').' '.&display_file().'?</p>');
+    $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
     &close_form($r);
+} 
+
+sub delete_dir_confirmed {
+    my ($r)=@_;
+    my $directory_name = $ENV{'form.currentpath'};
+    $directory_name =~ m/\/$/;
+    $directory_name = $`;
+    my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
+					       $ENV{'user.domain'},'portfolio'.
+					       $directory_name);
+					       
+    if ($result ne 'ok') {
+	$r->print('<font color="red"> An error occured (dir) ('.$result.
+		  ') while trying to delete '.$directory_name.'</font><br />');
+    } else {
+        # now remove from recent
+#        $r->print('<br /> removing '.$directory_name.'<br /');
+        &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
+        my @dirs = split m!/!, $directory_name;
+        
+#        $directory_name =~ m/^(\/*\/)(\/*.)$/;
+        $directory_name='/';
+        for (my $i=1; $i < (@dirs - 1); $i ++){
+            $directory_name .= $dirs[$i].'/';
+        }
+        $ENV{'form.currentpath'} = $directory_name;
+    }
+    $r->print(&done());
 }
 
-sub rename_confirmed {
+sub rename {
     my ($r)=@_;
-    &Apache::lonnet::renameuserfile($ENV{'form.currentpath'}.$ENV{'form.selectfile'}, 'rename', $ENV{'form.currentpath'}.$ENV{'form.filenewname'} );
-} 
+    my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
+    if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+        $r->print ("The file is locked and cannot be renamed.<br />");
+        $r->print(&done());
+    } else {
+        &open_form($r);
+        $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
+                   <input name="filenewname" type="input" size="50" />?</p>');
+        &close_form($r);
+    }
+}
 
-sub upload {
+sub rename_confirmed {
     my ($r)=@_;
-    #FIXME if the file already exists we need to do a confirmation pass 
-    #before overwriting
-    my $result=&Apache::lonnet::userfileupload('uploaddoc','',
-					 'portfolio'.$ENV{'form.currentpath'});
-    if ($result !~ m|^/uploaded/|) {
+    my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+    if ($filenewname eq '') {
+	$r->print('<font color="red">'.
+		  &mt("Error: no valid filename was provided to rename to.").
+		  '</font><br />');
+	$r->print(&done());
+	return;
+    } 
+    my $result=
+	&Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
+            'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
+            'portfolio'.$ENV{'form.currentpath'}.$filenewname);
+    if ($result ne 'ok') {
 	$r->print('<font color="red"> An errror occured ('.$result.
-		  ') while trying to upload '.&display_file().'</font><br />');
+		  ') while trying to rename '.&display_file().' to '.
+		  &display_file(undef,$filenewname).'</font><br />');
+    }
+    $r->print(&done());
+}
+sub select_files {
+    my ($r)=@_;
+    if ($ENV{'form.continue'} eq 'true') {
+        # here we update the selections for the currentpath
+        # eventually, have to handle removing those not checked, but . . . 
+        my @items=&Apache::loncommon::get_env_multiple('form.selectedfile');
+        &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
+    }
+    my $java_script =(<<ENDSMP);
+        <script language='javascript'>
+        function finishSelect() {
+            fileList = "";
+            for (i=0;i<document.forms.checkselect.length;i++) { 
+                if (document.forms.checkselect[i].checked){
+                    fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
+                }
+            }
+            opener.document.forms.lonhomework.
+ENDSMP
+    $java_script .= $ENV{'form.fieldname'};
+    $java_script .= (<<ENDSMP);
+        .value=fileList;
+            self.close();
+        }
+        </script>
+ENDSMP
+    $r->print($java_script);
+    $r->print("<h1>Select portfolio files</h1>
+                Check as many as you wish in response to the essay problem.<br />");
+    $r->print("<strong>Files selected:</strong><br />");
+    foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
+        $r->print($_."<br />");
+    }
+}
+sub upload {
+    my ($r)=@_;
+    my $fname=$ENV{'form.uploaddoc.filename'};
+    my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
+    my $disk_quota = 20000; # expressed in k
+    $fname=&Apache::lonnet::clean_filename($fname);
+    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+						 $ENV{'user.name'}).
+						'/userfiles/portfolio';
+    # Fixme --- Move the checking for existing file to LOND error return
+    my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
+					  $ENV{'user.domain'},
+					  $ENV{'user.name'},$portfolio_root);
+    my $found_file = 0;
+    foreach my $line (@dir_list) {
+        my ($filename)=split(/\&/,$line,2);
+        if ($filename eq $fname){
+            $found_file = 1;
+        }
+    }
+    my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
+    if (($current_disk_usage + $filesize) > $disk_quota){
+        $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
+                  '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
+    } 
+    elsif ($found_file){   
+        $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
+                  '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
+    } else {
+        my $result=&Apache::lonnet::userfileupload('uploaddoc','',
+	        	 'portfolio'.$ENV{'form.currentpath'});
+        if ($result !~ m|^/uploaded/|) {
+            $r->print('<font color="red"> An errror occured ('.$result.
+	              ') while trying to upload '.&display_file().'</font><br />');
+        }
     }
     $r->print(&done());
 }
 
 sub createdir {
     my ($r)=@_;
-    #FIXME 1) bad dirnames ( '/' etc)
-    #      2) file exists in place of dir (errormessage needs improvement)
-    my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
-	     $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});
-    if ($result ne 'ok') {
-	$r->print('<font color="red"> An errror occured ('.$result.
-		  ') while trying to create a new directory '.&display_file().'</font><br />');
+    my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+    if ($newdir eq '') {
+    	$r->print('<font color="red">'.
+	    	  &mt("Error: no directory name was provided.").
+		      '</font><br />');
+	    $r->print(&done());
+	    return;
+    } 
+    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+						 $ENV{'user.name'}).
+						'/userfiles/portfolio';
+    my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
+					  $ENV{'user.domain'},
+					  $ENV{'user.name'},$portfolio_root);
+    my $found_file = 0;
+    foreach my $line (@dir_list) {
+        my ($filename)=split(/\&/,$line,2);
+        if ($filename eq $newdir){
+            $found_file = 1;
+        }
+    }
+    if ($found_file){
+    	    $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.
+    	            ' </strong>a file or directory by that name already exists.</font><br />');
+    } else {
+        my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+	         $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
+        if ($result ne 'ok') {
+    	    $r->print('<font color="red"> An errror occured ('.$result.
+	    	      ') while trying to create a new directory '.&display_file().'</font><br />');
+        }
     }
     $r->print(&done());
 }
@@ -338,12 +465,9 @@ sub createdir {
 sub handler {
     # this handles file management
     my $r = shift;
-    my @dir_list; # will hold directory listing as array
-    my $udir; # returned from home server
-    my $currentFile; # directory or file contained in $pathToRoot.$current_path
-    my $action; # delete, rename, makedirectory, removedirectory,
-    my $filenewname; # for rename action (guess what we do with it!)
-    my $isFile;
+    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+							 $ENV{'user.name'}).
+							'/userfiles/portfolio';
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -355,22 +479,25 @@ sub handler {
     $r->rflush();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',
-					     'currentfile']);
-
-    # if we're uploading a file, we need to do it early so it will
-    # show in the directory list
-
+					     'currentfile','action','fieldname','mode']);
+	if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
+   	    $r->print('<font color="red"> No file was selected to upload.'.
+   	            'To upload a file, click <strong>Browse...</strong>'.
+   	            ', select a file, then click <strong>Upload</strong>,</font>');
+	}
     if ($ENV{'form.uploaddoc.filename'}) {
 	&upload($r);
+    } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
+	&delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {
-	if ($ENV{'form.confirmed'}) {
-	    &delete_confirmed($r);
-	} else {
-	    &delete($r);
-	}
+	&delete($r);
+    } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
+	&delete_dir_confirmed($r);
+    } elsif ($ENV{'form.action'} eq 'deletedir'){
+	&delete_dir($r);
+    } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
+	&rename_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'rename') {
-	# similarly, we need to delete or rename files before getting
-	# directory list
 	&rename($r);
     } elsif ($ENV{'form.createdir'}) {
 	&createdir($r);
@@ -379,24 +506,40 @@ sub handler {
 	if ($ENV{'form.currentpath'}) {
 	    $current_path = $ENV{'form.currentpath'};
 	}
-
-	my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
-							 $ENV{'user.name'}).
-							'/userfiles/portfolio';
-	@dir_list=&Apache::lonnet::dirlist($current_path,$ENV{'user.domain'},
-					   $ENV{'user.name'},$portfolio_root);
-    
+	my @dir_list=&Apache::lonnet::dirlist($current_path,
+					    $ENV{'user.domain'},
+					    $ENV{'user.name'},$portfolio_root);
+	if ($dir_list[0] eq 'no_such_dir'){
+	    # two main reasons for this:
+            #    1) never been here, so directory structure not created
+	    #    2) back-button navigation after deleting a directory
+	    if ($current_path eq '/'){
+	        &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
+					       $ENV{'user.domain'},'portfolio');
+	    } else {
+                # some directory that snuck in get rid of the directory
+                # from the recent pulldown, just in case
+		&Apache::lonhtmlcommon::remove_recent('portfolio',
+						      [$current_path]);
+		$current_path = '/'; # force it back to the root        
+	    }
+	    # now grab the directory list again, for the first time
+	    @dir_list=&Apache::lonnet::dirlist($current_path,
+					    $ENV{'user.domain'},
+					    $ENV{'user.name'},$portfolio_root);
+        }
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
-   
-	&display_directory($r,$current_path,\@dir_list);
-
+	&display_common($r,$current_path,$is_empty,\@dir_list);
+	if ($ENV{"form.mode"} eq 'selectfile'){
+	    &select_files($r);
+            &display_file_select($r,$current_path,$is_empty,\@dir_list);
+	} else {
+	    &display_directory($r,$current_path,$is_empty,\@dir_list);
+	}
+	$r->print("</body>\n</html>\n");
+	return OK;
     }
-
-    $r->print("</body>\n</html>\n");
-    $r->rflush();
-    return OK;
 }
-
 1;
 __END__