--- loncom/interface/portfolio.pm	2004/06/18 23:59:55	1.3
+++ loncom/interface/portfolio.pm	2004/07/01 18:59:33	1.10
@@ -32,37 +32,275 @@ use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonfeedback;
 use Apache::lonlocal;
-
+sub makeAnchor{
+    # receives a file name and path stub from username/userfiles/portfolio/
+    # returns an anchor tag consisting encoding filename and currentpath
+    my ($fileName, $currentPath) = @_;
+    my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';
+    return $anchor;
+}
+sub displayDirectory {
+    # returns html with <br /> separated contents of the directory
+    # returns a <strong>currentFile</strong> (bolds the selected file/dir)
+    my ($currentPath, $currentFile, $isDir, @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>'.(makeAnchor($fileName.'/', $currentPath.$fileName.'/').'</strong><br />');
+                }else{
+                    $displayOut.= (makeAnchor($fileName.'/', $currentPath.$fileName.'/').'<br />');
+                }
+            }else{
+                if ($fileName eq $currentFile){ #checks to bold the selected file
+                    $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');
+                }else{
+                    $displayOut.=(makeAnchor($fileName, $currentPath).'<br />');
+                }
+            }
+        }
+    	
+    }
+    return $displayOut;
+}
+sub displayActions {
+    # returns html to offer user appropriate actions depending on selected file/directory
+    my $displayOut;
+    my ($currentPath, $currentFile, $isDir, $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;
+}
 sub handler {
-	my $r=@_[0];
-	$r->content_type('text/html');
-	$r->send_http_header;
-	return OK if $r->header_only;
-	my $file=&Apache::lonnet::filelocation("",$r->uri);	
-	my $contents=&Apache::lonnet::getfile($file);
-	$r->print ('<br />Current contents of your portfolio directory: <br />');
-	$r->print (&Apache::lonnet::portfoliolist($r->uri, $ENV{'user.domain'}, $ENV{'user.name'}, udef ));
-	$r->print ('<br /> call to dirlist precedes <br />');
-	if ($ENV{'form.uploaddoc.filename'}){
-		$r->print ('<br /> call to userfileupload follows <br />');
-		$r->print (&Apache::lonnet::userfileupload('uploaddoc',undef,'portfolio').'<br />');	
-		$r->print ('<br /> call to userfileupload precedes <br />');
-	}
-
-	$r->print ($ENV{'form.uploaddoc.filename'}.'<br />');
-	$r->print ($ENV{'form.storeupl'}.'<br />');
-	$r->print ($ENV{'form.saywhat'}.'<br />');
-
-	$r->print("here's the form<br />");
-	# file upload form 
-	$r->print('<form method="post" enctype="multipart/form-data">');
-	$r->print('<input name="uploaddoc" type="file">'.
-	
-		'<input type="submit" name="storeupl" value="Upload">'
-		);
-	$r->print('</form>');
-	return OK;
+    # this handles file management
+    my $r = shift;
+    my @dirList; # will hold directory listing as array
+    my $udir; # returned from home server
+    my $currentPath; # path assuming /userfiles/portfolio/ as root
+    my $currentFile; # directory or file contained in $pathToRoot.$currentPath
+    my $action; # delete, rename, makedirectory, removedirectory,
+    my $filenewname; # for rename action (guess what we do with it!)
+    my $isFile;
+    my $isDir;
+    my $isEmpty;
+    # send header
+    # FIXME need to start using
+    &Apache::loncommon::no_cache($r);
+    &Apache::loncommon::content_type($r, 'text/html');
+    &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
+#
+#    $r->content_type('text/html');
+    $r->send_http_header;
+#    $r->print('<html><head><title>'.
+#               'Portfolio Management'.
+#               "</title></head>\n");
+# 
+    # FIXME need to start using
+#    $r->print('
+# 	<body bgcolor="dogfood">
+# 	<blockquote>');
 
+#    $r->content_type('text/html');
+#    $r->send_http_header;
+#    $r->print('<html><head><title>'.
+#              'Portfolio Management'.
+#              "</title></head>\n");
+#
+#    $r->print ('
+#    <body bgcolor="dogfood">
+#    <blockquote>');
+    #grab stuff that was sent
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['selectfile','currentpath', 'currentfile']);
+#   $r->print ('<br />CP= '.$ENV{'form.currentpath'}.'<br />');
+    # currentPath and currentFile need to be set for the rest of things to happen
+    # sometimes, currentFile will be passed by a form field, selectedfile
+    # if there is no 'form.selectedfile' then the current directory is 
+    # considered as selected 
+    if ($ENV{'form.currentpath'}){
+        $currentPath = $ENV{'form.currentpath'};
+    }else{
+        $currentPath = '/';
+    }
+    if ($ENV{'form.selectfile'}){
+        $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');
+        # have to check if the selected file is a subdirectory
+        if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
+            # $currentPath =~ /\-\(Dir\)/;
+            $currentPath = $`.'/';
+            $r->print('<br />'.$currentPath.'<br />');
+        }
+        $currentFile = $ENV{'form.selectfile'};
+    }else{
+        $currentFile = '';
+    }
+    # if we're uploading a file, we need to do it early so it will show in the directory list
+    if ($ENV{'form.uploaddoc.filename'}){
+        $r->print ($ENV{'form.storeupl'}.'<br />');
+        $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
+    }
+    # similarly, we need to delete or rename files before getting directory list
+    if ($ENV{'form.selectfile'}){
+        if ($ENV{'form.fileaction'} eq 'delete'){
+            $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');
+            $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
+            $currentFile = '';
+        }elsif($ENV{'form.fileaction'} eq 'rename')  {
+            &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} );
+            # $r->print ('We will rename your file');
+        }
+    }
+    # we always need $dirList, plus this will return information about the current file
+    # as well as information about he home server directory structure, specifically
+    # the path to the users userfiles directory.    
+#    $r->print('dir list follows<br />'.&Apache::lonnet::portfoliolist($currentPath, $currentFile).'<br />');
+	my $list = &Apache::lonnet::portfoliolist($currentPath, $currentFile);
+	@dirList = split(/:/,$list);
+#    foreach my $line (@dirlist) {
+# 
+#    	#$strip holds directory/file name
+#    	#$dom 
+#    	my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+#    	$r->print ($strip.' '.$testdir.'<br />');
+#    }
+#    @dirList = split /<br\s\/>/, (&Apache::lonnet::portfoliolist($currentPath, $currentFile));
+    
+    # portfoliolist returns isdir, isfile and udir as the final array elements
+    # we'll pop them off the bottom of the array, and put them where they belong
+    
+    # $londcall added to help debug, contains the command sent to lond
+ #   my $londcall = pop @dirList;
+ #   $r->print ('<br />udir '.$londcall.'<br />');
+ #   $udir = pop @dirList;
+ #   $r->print ('<br />path returned '.$udir.'<br />');
+ #   $isFile = pop @dirList;
+#   $r->print ('<br />isfile '.$isFile.'<br />');
+#    $isDir = pop @dirList;
+    if (@dirList == 2){ # need to know if directory is empty to it can be removed if desired
+        $isEmpty = 1;
+    }else{
+        $isEmpty = 0;
+    }
+#   $r->print ('<br />lines left ind dirlist '.@dirList.'<br />');
+#   return OK if $r->header_only;
+    # Stuff to maintain proper setting for selected file
+    if ($ENV{'form.selectfile'}){
+        if ($ENV{'form.fileaction'} eq 'delete'){
+            &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );
+            $ENV{'portfolio.file'} = 'Selected File Deleted';
+        }elsif($ENV{'form.fileaction'} eq 'rename')  {
+            &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );
+#           $r->print ('We will rename your file');
+        }else{
+    
+        # Remember user's file selection for later
+        $ENV{'portfolio.file'} = $ENV{'form.selectfile'};
+        # offer things user can do with selected file
+        }
+    }else{
+        unless ($ENV{'portfolio.file'}){
+            $ENV{'portfolio.file'} = 'No File Selected';
+        }
+    }
+    ##############################
+    #
+    # Display begins here
+    #
+    ##############################
+    $r->print ('<hr /> start ');
+    $r->print ($udir);
+    $r->print ('<table border=1><tr><td>');
+    $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));
+    $r->print ('</td>><td>');
+    $r->print (displayActions ($currentPath, $currentFile, $isDir, $isEmpty));
+    $r->print ('</td>></tr></table>');
+    $r->print ('<br />end display<br /><hr />');
+    $r->print ('</blockquote></body>');
+    return OK;
 }
 
 1;