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

Diff for /loncom/interface/portfolio.pm between versions 1.6 and 1.16

version 1.6, 2004/06/25 18:47:18 version 1.16, 2004/07/23 01:25:56
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;
   
   # receives a file name and path stub from username/userfiles/portfolio/
   # returns an anchor tag consisting encoding filename and currentpath
 sub makeAnchor{  sub makeAnchor{
  # receives a file name assumed to reside in username/userfiles/portfolio/      my ($fileName, $currentPath) = @_;
  # returns a form consisting of a single submit button labeled with the file name      my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';
  my ($fileName, $currentPath) = @_;      return $anchor;
  my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';  
 # my $button = '  
 # <form method="POST" action="/adm/portfolio">  
 # <input type="hidden" name="selectfile" value="'.$fileName.'">  
 # <input type="submit" value="'.$fileName.'" name="storeupl">  
 # </form>  
 # ';  
  return $anchor;  
 }  }
   
   # returns html with <br /> separated contents of the directory
   # returns a <strong>currentFile</strong> (bolds the selected file/dir)
 sub displayDirectory {  sub displayDirectory {
  # returns html with <br /> separated contents of the directory      my ($currentPath, $currentFile, @dirList,) = @_;
  # returns a <strong>currentFile</strong> (bolds the selected file/dir)      my $displayOut='';  
       my $fileName;
  my ($currentPath, $currentFile, $isDir, @dirList,) = @_;      my $upPath;
  my $displayOut='';      if ($currentPath ne '/'){
  my $fileName;          $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.
  my $upPath;          # provides the "up one directory level" function
  if ($currentPath ne '/'){          # it means shortening the currentpath to the parent directory
  $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.          $currentPath =~ m:(^/.*)(/.*/$):;
  # provides the "up one directory level" function          if ($1 ne '/'){
  # it means shortening the currentpath to the parent directory              $upPath = $1.'/';
  $currentPath =~ m:(^/.*)(/.*/$):;          }else{
  if ($1 ne '/'){              $upPath = $1;
  $upPath = $1.'/';          }
  }else{          
  $upPath = $1;          $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';
  }      } else {
           $displayOut = $displayOut.'at root '.$currentPath.'<br />';
  $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile=updir&currentpath='.$upPath.'">..</a><br />';      }
  } else {      foreach my $line (@dirList) {
  $displayOut = $displayOut.'at root '.$currentPath.'<br />';      #$strip holds directory/file name
  }      #$dom 
  while ($fileName = shift @dirList){      my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$path)=split(/\&/,$line,17); 
  if (($fileName ne './') && ($fileName ne '../')){      $path =~ m:/:;
  if ($fileName =~ m:/$:){      my $dirDepth = @-;
  # handle directories different from files          if (($fileName ne '.') && ($fileName ne '..')){
  if ($fileName eq $currentFile){ #checks to bold the selected file            for (my $i = 0; $i <= $dirDepth; $i += 1){
  $displayOut = $displayOut.'<strong>'.(makeAnchor($fileName, $currentPath.$fileName).'</strong><br />');             $displayOut.='<blockquote>';
  }else{         }
  $displayOut = $displayOut.(makeAnchor($fileName, $currentPath.$fileName).'<br />');              if ($testdir =~ m:^1:){
  }                  # handle directories different from files
  }else{                  if ($fileName eq $currentFile){ #checks to bold the selected file
  if ($fileName eq $currentFile){ #checks to bold the selected file                      $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $path.$fileName.'/').'</strong><br />'."\n");
  $displayOut = $displayOut.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');                  }else{
  }else{                      $displayOut.= (makeAnchor($fileName.'/', $path.$fileName.'/').'<br />'."\n");
  $displayOut = $displayOut.(makeAnchor($fileName, $currentPath).'<br />');                  }
  }              }else{
  }                  if ($fileName eq $currentFile){ #checks to bold the selected file
  }                      $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");
  }                  }else{
  $displayOut = $displayOut.                      $displayOut.=(makeAnchor($fileName, $currentPath).'<br />'."\n");
  return $displayOut;                  }
               }
           for (my $i = 0; $i <= $dirDepth; $i += 1){
              $displayOut.='</blockquote>';
          }
               
           }
      
       }
       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;
 }  }
 sub handler {  sub handler {
  # this handles file management      # this handles file management
  my $r=@_[0];      my $r = shift;
  my @dirList; # will hold directory listing as array      my @dirList; # will hold directory listing as array
  my $udir; # returned from home server      my $udir; # returned from home server
  my $currentPath; # path assuming /userfiles/portfolio/ as root      my $currentPath; # path assuming /userfiles/portfolio/ as root
  my $currentFile; # directory or file contained in $pathToRoot.$currentPath      my $currentFile; # directory or file contained in $pathToRoot.$currentPath
  my $action; # delete, rename, makedirectory, removedirectory,      my $action; # delete, rename, makedirectory, removedirectory,
  my $filenewname; # for rename action (guess what we do with it!)      my $filenewname; # for rename action (guess what we do with it!)
  my $isFile;      my $isFile;
  my $isDir;      my $isEmpty;
  # send header      &Apache::loncommon::no_cache($r);
  $r->content_type('text/html');      &Apache::loncommon::content_type($r,'text/html');
  $r->send_http_header;      $r->send_http_header;
  $r->print('<html><head><title>'.      # Give the LON-CAPA page header
               'Portfolio Management'.      $r->print('<html><head><title>'.
               "</title></head>\n");                &mt('Portfolio Manager').
                 "</title></head>\n".
  $r->print ('                &Apache::loncommon::bodytag('Portfolio Manager'));
  <body bgcolor="dogfood">      $r->rflush();
  <blockquote>');      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  #grab stuff that was sent  
  &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},  
                                             ['selectfile','currentpath', 'currentfile']);                                              ['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
  # currentPath and currentFile need to be set for the rest of things to happen      # sometimes, currentFile will be passed by a form field, selectedfile
  # sometimes, currentFile will be passed by a form field, selectedfile      # if there is no 'form.selectedfile' then the current directory is 
  # if there is no 'form.selectedfile' then the current directory is       # considered as selected 
  # considered as selected       if ($ENV{'form.currentpath'}) {
  if ($ENV{'form.currentpath'}){          $currentPath = $ENV{'form.currentpath'};
  $currentPath = $ENV{'form.currentpath'};      } else {
  }else{          $currentPath = '/';
  $currentPath = '/';      }
  }      if ($ENV{'form.selectfile'}) {
  if ($ENV{'form.selectfile'}){          # have to check if the selected file is a subdirectory
  $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');          if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
  # have to check if the selected file is a subdirectory              # $currentPath =~ /\-\(Dir\)/;
  if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){              $currentPath = $`.'/';
  # $currentPath =~ /\-\(Dir\)/;              $r->print('<br />'.$currentPath.'<br />');
  $currentPath = $`.'/';          }
  $r->print('<br />'.$currentPath.'<br />');          $currentFile = $ENV{'form.selectfile'};
  }      } else {
  $currentFile = $ENV{'form.selectfile'};          $currentFile = '';
  }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'}) {
  # if we're uploading a file, we need to do it early so it will show in the directory list          $r->print($ENV{'form.storeupl'}.'<br />');
  if ($ENV{'form.uploaddoc.filename'}){          $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
  $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'}){
  # similarly, we need to delete or rename files before getting directory list          if ($ENV{'form.fileaction'} eq 'delete') {
  if ($ENV{'form.selectfile'}){              $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');
  if ($ENV{'form.fileaction'} eq 'delete'){              $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
  &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );              $currentFile = '';
  $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'} );
  &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
  # we always need $dirList, plus this will return information about the current file      # the path to the users userfiles directory.    
  # as well as information about he home server directory structure, specifically      # 
  # the path to the users userfiles directory.      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
  @dirList = split /<br\s\/>/, (&Apache::lonnet::portfoliolist($currentPath, $currentFile));       $ENV{'user.name'}).
  # portfoliolist returns isdir, isfile and udir as the final array elements         '/userfiles/portfolio';
  # we'll pop them off the bottom of the array, and put them where they belong      my $done = 0;
       my $subdir = '';
  # $londcall added to help debug      my @workinglist; # intermediate array, holds directory listing lines (dirlist), and path information
  my $londcall = pop @dirList;      my $readDirectory = 1; # flag for directory
  $r->print ('<br />udir '.$londcall.'<br />');      my $loopCounter = 0; # needed only for development to prevent run away program (or maybe more?)
  $udir = pop @dirList;      while (!$done){
  $r->print ('<br />path returned '.$udir.'<br />');          # Needed while developing. Later, too?
  $isFile = pop @dirList;          $loopCounter += 1;
 # $r->print ('<br />isfile '.$isFile.'<br />');          if ($loopCounter > 50) {
  $isDir = pop @dirList;              $r->print('<br />stop runaway');
 # $r->print ('<br />isdir '.$isDir.'<br />');              return OK;
 # return OK if $r->header_only;          }
  # Stuff to maintain proper setting for selected file          # ---
  if ($ENV{'form.selectfile'}){          if ($readDirectory){ # is true the first time through, then true if dirlist line is a subdir
  if ($ENV{'form.fileaction'} eq 'delete'){              # $r->print('<br />reading '.$portfolio_root.$subdir);
  &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );              my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$subdir);
  $ENV{'portfolio.file'} = 'Selected File Deleted';              foreach my $line(@list){
  }elsif($ENV{'form.fileaction'} eq 'rename')  {                  $line = $line.'&'.$subdir; # append the subdirectory information
  &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );                  my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17); 
 # $r->print ('We will rename your file');                  if (($fileName ne '.') && ($fileName ne '..')){ # we throw away the current and parent directories
  }else{                      $r->print('<br />'.$line);
                       # should this be shift?
  # Remember user's file selection for later                      push @workinglist, $line; # add the line to the working list array
  $ENV{'portfolio.file'} = $ENV{'form.selectfile'};                  }
  # offer things user can do with selected file              }
  }          }
  }else{          my $line = shift @workinglist; #take one off the working list
  unless ($ENV{'portfolio.file'}){          if ($line eq '') { # if the working list is empty
  $ENV{'portfolio.file'} = 'No File Selected';              $done = 1;
  }          }else{
  }              push @dirList, $line; # and put it in the display list
  ##############################              my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17); 
  #              if ($testdir =~ m:^1:) { # true if this is a directory
  # Display begins here                  # $r->print('<br />added subdir '.$fileName);
  #                  $subdir = $subpath.'/'.$fileName; 
  ##############################                  $readDirectory = 1;
  $r->print ('<hr /> start ');              }else{
  $r->print ($udir);                  $readDirectory = 0;
  $r->print ('<table border=1><tr><td>');              }
  $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));          }
  $r->print ('</td>><td>');      }
  $r->print (displayActions ($currentPath, $currentFile, $isDir, $isFile));      # if item is directory {  get the next level down
  $r->print ('</td>></tr></table>');      # my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$);
  $r->print ('<br />end display<br /><hr />');      
  $r->print ('</blockquote></body>');      if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired
  return OK;          $isEmpty = 1;
       } else {
           $isEmpty = 0;
       }
      
       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'});
           } 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('<table border=1><tr><td>');
       $r->print(displayDirectory($currentPath, $currentFile, @dirList));
       $r->print('</td>><td>');
       $r->print(displayActions($currentPath, $currentFile, $isEmpty));
       $r->print('</td>></tr></table>');
       $r->print('</blockquote>');
       $r->print("</body>\n</html>\n");
       $r->rflush();
       return OK;
 }  }
   
 1;  1;
Removed from v.1.6  
changed lines
  Added in v.1.16

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