--- loncom/interface/portfolio.pm	2004/07/01 18:59:33	1.10
+++ loncom/interface/portfolio.pm	2004/08/24 05:01:42	1.23
@@ -18,12 +18,9 @@
 #
 # /home/httpd/html/adm/gpl.txt
 #
-
-
 # http://www.lon-capa.org/
 #
 
-
 package Apache::portfolio;
 use strict;
 use Apache::Constants qw(:common :http);
@@ -32,65 +29,71 @@ 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>';
+
+# 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>';
     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,) = @_;
+
+# returns html with <br /> separated contents of the directory
+# returns a <strong>currentFile</strong> (bolds the selected file/dir)
+sub display_directory {
+    my ($currentPath, $currentFile, @dirList,) = @_;
     my $displayOut='';  
-    my $fileName;
+    my $filename;
     my $upPath;
-    if ($currentPath ne '/'){
-        $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.
+    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 '/'){
+        if ($1 ne '/') {
             $upPath = $1.'/';
-        }else{
+        } else {
             $upPath = $1;
         }
         
-        $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';
+        # $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';
     } else {
-        $displayOut = $displayOut.'at root '.$currentPath.'<br />';
+        # $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:){
+    	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 />');
+                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>'.(makeAnchor($fileName, $currentPath).'</strong><br />');
-                }else{
-                    $displayOut.=(makeAnchor($fileName, $currentPath).'<br />');
+            } 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, $isDir, $isEmpty) = @_;
+    my ($currentPath, $currentFile, $isEmpty) = @_;
 #   $displayOut = 'here are actions for '.$currentFile;
-    if ($currentFile =~ m:/$:){
+    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 '/')) {
@@ -117,7 +120,7 @@ sub displayActions {
             value="Rename '.$currentFile.'" />
             </form>';
         }
-    }else{  #action options offered for files
+    } else {  #action options offered for files
         $displayOut = $displayOut.'<form method="POST">';
         $displayOut = $displayOut.'<input type="hidden" name="selectfile"';
         $displayOut = $displayOut.'value="'.$currentFile;
@@ -155,9 +158,11 @@ sub displayActions {
             ';
     return $displayOut;
 }
+
 sub handler {
     # this handles file management
     my $r = shift;
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my @dirList; # will hold directory listing as array
     my $udir; # returned from home server
     my $currentPath; # path assuming /userfiles/portfolio/ as root
@@ -165,123 +170,81 @@ sub handler {
     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
+    my $dirptr=16384;
     &Apache::loncommon::no_cache($r);
-    &Apache::loncommon::content_type($r, 'text/html');
-    &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
-#
-#    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'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
+    # Give the LON-CAPA page header
+    $r->print('<html><head><title>'.
+              &mt('Portfolio Manager').
+              "</title></head>\n".
+              &Apache::loncommon::bodytag('Portfolio Manager'));
+    $r->rflush();
     &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'}){
+    if ($ENV{'form.currentpath'}) {
         $currentPath = $ENV{'form.currentpath'};
-    }else{
+    } else {
         $currentPath = '/';
     }
-    if ($ENV{'form.selectfile'}){
-        $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');
+    if ($ENV{'form.selectfile'}) {
         # have to check if the selected file is a subdirectory
-        if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
+        if ($ENV{'form.selectfile'} =~ /-\(Dir\)/) {
             # $currentPath =~ /\-\(Dir\)/;
             $currentPath = $`.'/';
             $r->print('<br />'.$currentPath.'<br />');
         }
         $currentFile = $ENV{'form.selectfile'};
-    }else{
+    } 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 />');  
+    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'){
+    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')  {
+        } 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
+    # as well as information about the 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
+    # 
+    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+						     $ENV{'user.name'}).
+						       '/userfiles/portfolio';
+    @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
     
-    # $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
+    if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired
         $isEmpty = 1;
-    }else{
+    } 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'){
+   
+    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
+        } elsif ($ENV{'form.fileaction'} eq 'rename') {
+            &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'});
+        } else {
+	    # Remember user's file selection for later
+	    $ENV{'portfolio.file'} = $ENV{'form.selectfile'};
+	    # offer things user can do with selected file
         }
-    }else{
+    } else {
         unless ($ENV{'portfolio.file'}){
             $ENV{'portfolio.file'} = 'No File Selected';
         }
@@ -291,15 +254,78 @@ sub handler {
     # 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>');
+    $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" />'.
+        '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.
+        '<input type="submit" name="storeupl" value="Upload" />'.
+        '</form>';
+    $r->print($displayOut);
+    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
+    my $displayOut = '<form method="post">';
+    $displayOut = $displayOut.'<input name="newdir" type="input" />'.
+        '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.
+        '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
+        '</form>';
+    $r->print($displayOut);
+    $r->print('</td></tr></table>');
+    my @tree = split (/\//,$currentPath);
+    $r->print('<font size="+2">'.&make_anchor('/','/'));
+    if (@tree > 1){
+        my $newCurrentPath = '';
+        for (my $i = 1; $i< @tree; $i++){
+            $newCurrentPath .= $tree[$i].'/';
+            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+        }
+    }
+    $r->print('</font>');
+    &Apache::lonhtmlcommon::store_recent('portfolio',$currentPath,$currentPath);
+    $r->print('<br /><form method=post action="/adm/portfolio">'.
+	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+						    'this.form.submit();'));
+    $r->print("</form>");
+    $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/$currentPath/";
+    foreach my $line (@dirList) {
+    	#$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.'/',$currentPath.$filename.'/').'</td>'); 
+                $r->print('</tr>'); 
+            } else {
+                $r->print('<tr bgcolor="#CCCCFF">');
+                $r->print('<td>
+<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" />
+</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>'); 
+            }
+        }
+    }
+#   <tr bgcolor="#FFAA99"> pink bg 
+#   <tr bgcolor="#CCCCFF"> blue bg            
+#   $r->print(&display_directory($currentPath, $currentFile, @dirList));
+#    $r->print('</td>><td>');
+#   $r->print(&display_actions($currentPath, $currentFile, $isEmpty));
+    $r->print('</table></form>');
+    $r->print('</blockquote>');
+    $r->print("</body>\n</html>\n");
+    $r->rflush();
     return OK;
 }