[BACK]Return to portfolio.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/portfolio.pm between versions 1.7 and 1.29

version 1.7, 2004/06/25 20:50:05 version 1.29, 2004/08/24 07:35:57
Line 18 Line 18
 #  #
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
   
   
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
 package Apache::portfolio;  package Apache::portfolio;
 use strict;  use strict;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
Line 32  use Apache::lonnet; Line 29  use Apache::lonnet;
 use Apache::lontexconvert;  use Apache::lontexconvert;
 use Apache::lonfeedback;  use Apache::lonfeedback;
 use Apache::lonlocal;  use Apache::lonlocal;
 sub makeAnchor{  
  # receives a file name assumed to reside in username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
  # returns a form consisting of a single submit button labeled with the file name  # returns an anchor tag consisting encoding filename and currentpath
  my ($fileName, $currentPath) = @_;  sub make_anchor {
  my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';      my ($filename, $current_path) = @_;
 # my $button = '      my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';
 # <form method="POST" action="/adm/portfolio">      return $anchor;
 # <input type="hidden" name="selectfile" value="'.$fileName.'">  
 # <input type="submit" value="'.$fileName.'" name="storeupl">  
 # </form>  
 # ';  
  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=updir&currentpath='.$upPath.'">..</a><br />';  
  } else {  
  $displayOut = $displayOut.'at root '.$currentPath.'<br />';  
  }  
  while ($fileName = shift @dirList){  
  if (($fileName ne './') && ($fileName ne '../')){  
  if ($fileName =~ m:/$:){  
  # handle directories different from files  
  if ($fileName eq $currentFile){ #checks to bold the selected file  
  $displayOut = $displayOut.'<strong>'.(makeAnchor($fileName, $currentPath.$fileName).'</strong><br />');  
  }else{  
  $displayOut = $displayOut.(makeAnchor($fileName, $currentPath.$fileName).'<br />');  
  }  
  }else{  
  if ($fileName eq $currentFile){ #checks to bold the selected file  
  $displayOut = $displayOut.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');  
  }else{  
  $displayOut = $displayOut.(makeAnchor($fileName, $currentPath).'<br />');  
  }  
  }  
  }  
  }  
  $displayOut = $displayOut.  
  return $displayOut;  
 }  }
   
   # 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 {  sub displayActions {
  # returns html to offer user appropriate actions depending on selected file/directory      # returns html to offer user appropriate actions depending on selected file/directory
  my $displayOut;      my $displayOut;
  my ($currentPath, $currentFile, $isDir, $isFile) = @_;      my ($currentPath, $currentFile, $isEmpty) = @_;
 # $displayOut = 'here are actions for '.$currentFile;  #   $displayOut = 'here are actions for '.$currentFile;
  if ($isDir){      if ($currentFile =~ m:/$:) {
  $displayOut = 'Directory';          # if the selected file is a directory, these are the options
  }          # offer the chance to delete the directory only if it is empty
  if ($isFile){          if ($isEmpty && ($currentPath ne '/')) {
  $displayOut = 'File';              $displayOut =   $displayOut.'<form method="POST">
  }              <input type="hidden" name="selectfile" 
               value="'.$currentFile.'" />
  $displayOut = $displayOut.'<form method="POST">              <input type="hidden" name="fileaction" value="delete" /> 
  <input type="hidden" name="selectfile"               <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
  value="'.$currentFile.'">              <center>
  <input type="hidden" name="fileaction" value="delete">               <input type="submit" 
  <center>              value="Delete '.$currentFile.'" />
  <input type="submit"               </center>
               </form>';
  value="Delete '.$currentFile.'">          } 
  </center>          if ($currentPath ne '/') {
  </form>              $displayOut = $displayOut.'<hr />
  <hr />              <form method="POST">
  <form method="POST">              <input type="hidden" name="selectfile" 
  <input type="hidden" name="selectfile"               value="'.$currentFile.'" />
  value="'.$currentFile.'">              <input type="hidden" name="fileaction" value="rename" /> 
  <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="input" name="filenewname" value="Type new name here" /> 
  <input type="submit"               <input type="submit" 
  value="Rename '.$currentFile.'">              value="Rename '.$currentFile.'" />
  </form>              </form>';
  <hr>';          }
  $displayOut = $displayOut.'<hr>Add a file to your portfolio';      } else {  #action options offered for files
  # file upload form           $displayOut = $displayOut.'<form method="POST">';
  $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';          $displayOut = $displayOut.'<input type="hidden" name="selectfile"';
  $displayOut = $displayOut.'<input name="uploaddoc" type="file">'.          $displayOut = $displayOut.'value="'.$currentFile;
  '<input type="hidden" name="currentpath" value="'.$currentPath.'">'.          $displayOut = $displayOut.'" /><input type="hidden" name="fileaction" value="delete" /> 
  '<input type="submit" name="storeupl" value="Upload">'.          <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
  '</form><hr>';          <center>
  $displayOut = $displayOut.'<form method="POST">          <input type="submit"
  <input name="subdir" type="text" >          value="Delete '.$currentFile.'" />
  <input type="submit" value="Create Subdirectory">          </center>
  </form>          </form>';
  ';      
  return $displayOut;          $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)=@_;
       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" />'.
           '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '<input type="submit" name="storeupl" value="Upload" />'.
           '</form>';
       $r->print($displayOut);
       $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
       $displayOut = '<form method="post">';
       $displayOut .= '<input name="newdir" type="input" />'.
           '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '<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('portfolio','/').'/');
       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',$current_path,$current_path);
       $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/$current_path/";
       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.'/').'</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>');
                   $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($current_path, $currentFile, @dir_list));
   #    $r->print('</td>><td>');
   #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
       $r->print('</table></form>');
   }
   
   sub open_form {
       my ($r)=@_;
       $r->print('<form method="post" action="/adm/portfolio">');
       $r->print('<input type="hidden" name="action" value="'.
         $ENV{'form.action'}.'" />');
       $r->print('<input type="hidden" name="confirmed" value="1" />');
       $r->print('<input type="hidden" name="selectfile" value="'.
         $ENV{'form.selectfile'}.'" />');
       $r->print('<input type="hidden" name="currentpath" value="'.
         $ENV{'form.currentpath'}.'" />');
   }
   
   sub close_form {
       my ($r)=@_;
       $r->print('<p><input type="submit" value="'.&mt('Continue').
         '" /></p></form>');
       $r->print('<form action="/adm/portfolio" method="POST">
                  <p>
                 <input type="hidden" name="currentpath" value="'.
         $ENV{'form.currentpath'}.'" />
                    <input type="submit" value="'.&mt('Cancel').'" />
                  </p></form>');
   
   }
   
   sub display_file {
       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>');
   }
   
   sub delete {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
       &close_form($r);
   } 
   
   sub delete_confirmed {
       my ($r)=@_;
       my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio'.
          $ENV{'form.currentpath'}.
          $ENV{'form.selectfile'});
       if ($result ne 'ok') {
    $r->print('<font color="red"> An errror occured ('.$result.
     ') while trying to delete '.&display_file().'</font><br />');
       }
       $r->print(&done());
   }
   
   sub rename {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                  <input name="filenewname" type="input" size="50" />?</p>');
       &close_form($r);
 }  }
   
   sub rename_confirmed {
       my ($r)=@_;
       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'}.$ENV{'form.filenewname'});
       if ($result ne 'ok') {
    $r->print('<font color="red"> An errror occured ('.$result.
     ') while trying to rename '.&display_file().' to '.
     &display_file(undef,$filenewname).'</font><br />');
       }
       $r->print(&done());
   }
   
   sub upload {
       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/|) {
    $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) file exists in place of dir (errormessage needs improvement)
       my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
       if ($newdir eq '') {
    $r->print('<font color="red">'.
     &mt("Error: no valid directory name was provided.").
     '</font><br />');
    $r->print(&done());
    return;
       } 
       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());
   }
   
 sub handler {  sub handler {
  # this handles file management      # this handles file management
  my ($r)=@_;      my $r = shift;
  my @dirList; # will hold directory listing as array      &Apache::loncommon::no_cache($r);
  my $udir; # returned from home server      &Apache::loncommon::content_type($r,'text/html');
  my $currentPath; # path assuming /userfiles/portfolio/ as root      $r->send_http_header;
  my $currentFile; # directory or file contained in $pathToRoot.$currentPath      # Give the LON-CAPA page header
  my $action; # delete, rename, makedirectory, removedirectory,      $r->print('<html><head><title>'.
  my $filenewname; # for rename action (guess what we do with it!)                &mt('Portfolio Manager').
  my $isFile;                "</title></head>\n".
  my $isDir;                &Apache::loncommon::bodytag('Portfolio Manager'));
  # send header      $r->rflush();
  $r->content_type('text/html');      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  $r->send_http_header;                                              ['selectfile','currentpath',
  $r->print('<html><head><title>'.       'currentfile']);
               'Portfolio Management'.  
               "</title></head>\n");      if ($ENV{'form.uploaddoc.filename'}) {
    &upload($r);
  $r->print ('      } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
  <body bgcolor="dogfood">   &delete_confirmed($r);
  <blockquote>');      } elsif ($ENV{'form.action'} eq 'delete') {
  #grab stuff that was sent   &delete($r);
  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
                                             ['selectfile','currentpath', 'currentfile']);   &rename_confirmed($r);
  $r->print ('<br />CP= '.$ENV{'form.currentpath'}.'<br />');      } elsif ($ENV{'form.action'} eq 'rename') {
  # currentPath and currentFile need to be set for the rest of things to happen   &rename($r);
  # sometimes, currentFile will be passed by a form field, selectedfile      } elsif ($ENV{'form.createdir'}) {
  # if there is no 'form.selectedfile' then the current directory is    &createdir($r);
  # considered as selected       } else {
  if ($ENV{'form.currentpath'}){   my $current_path='/';
  $currentPath = $ENV{'form.currentpath'};   if ($ENV{'form.currentpath'}) {
  }else{      $current_path = $ENV{'form.currentpath'};
  $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'){  
  &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );  
  $currentFile = '';  
  }elsif($ENV{'form.fileaction'} eq 'rename')  {  
  &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $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.  
  @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  
  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;  
 # $r->print ('<br />isdir '.$isDir.'<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';  
  }  
  }   }
  ##############################  
  #   my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
  # Display begins here   $ENV{'user.name'}).
  #   '/userfiles/portfolio';
  ##############################   my @dir_list=&Apache::lonnet::dirlist($current_path,
  $r->print ('<hr /> start ');      $ENV{'user.domain'},
  $r->print ($udir);      $ENV{'user.name'},$portfolio_root);
  $r->print ('<table border=1><tr><td>');      
  $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));   # need to know if directory is empty so it can be removed if desired
  $r->print ('</td>><td>');   my $is_empty=(@dir_list == 2);
  $r->print (displayActions ($currentPath, $currentFile, $isDir, $isFile));     
  $r->print ('</td>></tr></table>');   &display_directory($r,$current_path,\@dir_list);
  $r->print ('<br />end display<br /><hr />');  
  $r->print ('</blockquote></body>');      }
  return OK;  
       $r->print("</body>\n</html>\n");
       $r->rflush();
       return OK;
 }  }
   
 1;  1;
Removed from v.1.7  
changed lines
  Added in v.1.29

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>