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

Diff for /loncom/interface/portfolio.pm between versions 1.9 and 1.10

version 1.9, 2004/06/28 16:12:06 version 1.10, 2004/07/01 18:59:33
Line 32  use Apache::lonnet; Line 32  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 filename      # returns an anchor tag consisting encoding filename and currentpath
 sub makeAnchor {  
     my ($fileName, $currentPath) = @_;      my ($fileName, $currentPath) = @_;
     my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';      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;      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
       # returns a <strong>currentFile</strong> (bolds the selected file/dir)
     my ($currentPath, $currentFile, $isDir, @dirList,) = @_;      my ($currentPath, $currentFile, $isDir, @dirList,) = @_;
     my $displayOut='';      my $displayOut='';  
     my $fileName;      my $fileName;
     my $upPath;      my $upPath;
     if ($currentPath ne '/') {      if ($currentPath ne '/'){
  $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.          $displayOut = 'Listing of '.$currentPath.'<br /><hr />'.
     # provides the "up one directory level" function          # provides the "up one directory level" function
     # it means shortening the currentpath to the parent directory          # it means shortening the currentpath to the parent directory
     $currentPath =~ m:(^/.*)(/.*/$ ):;          $currentPath =~ m:(^/.*)(/.*/$):;
  if ($1 ne '/') {          if ($1 ne '/'){
     $upPath = $1.'/';              $upPath = $1.'/';
  } else {          }else{
     $upPath = $1;              $upPath = $1;
  }          }
           
  $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile=updir&currentpath='.$upPath.'">..</a><br />';          $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';
     } else {      } else {
  $displayOut = $displayOut.'at root '.$currentPath.'<br />';          $displayOut = $displayOut.'at root '.$currentPath.'<br />';
     }      }
     while ($fileName = shift @dirList) {      foreach my $line (@dirList) {
  if (($fileName ne './') && ($fileName ne '../')) {      #$strip holds directory/file name
     if ($fileName =~ m:/$:) {      #$dom 
  # handle directories different from files      my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
  if ($fileName eq $currentFile) {          if (($fileName ne '.') && ($fileName ne '..')){
     #checks to bold the selected file              if ($testdir =~ m:^1:){
     $displayOut = $displayOut.'<strong>'.(&makeAnchor($fileName, $currentPath.$fileName).'</strong><br />');                  # handle directories different from files
  } else {                  if ($fileName eq $currentFile){ #checks to bold the selected file
     $displayOut = $displayOut.(&makeAnchor($fileName, $currentPath.$fileName).'<br />');                      $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $currentPath.$fileName.'/').'</strong><br />');
  }                  }else{
     } else {                      $displayOut.= (makeAnchor($fileName.'/', $currentPath.$fileName.'/').'<br />');
  if ($fileName eq $currentFile) {                  }
     #checks to bold the selected file              }else{
     $displayOut = $displayOut.'<strong>'.(&makeAnchor($fileName, $currentPath).'</strong><br />');                  if ($fileName eq $currentFile){ #checks to bold the selected file
  } else {                      $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />');
     $displayOut = $displayOut.(&makeAnchor($fileName, $currentPath).'<br />');                  }else{
  }                      $displayOut.=(makeAnchor($fileName, $currentPath).'<br />');
     }                  }
  }              }
           }
      
     }      }
     #$displayOut = $displayOut.  
     return $displayOut;      return $displayOut;
 }  }
   
 # returns html to offer user appropriate actions depending on selected  
 # file/directory  
 sub displayActions {  sub displayActions {
       # returns html to offer user appropriate actions depending on selected file/directory
     my $displayOut;      my $displayOut;
     my ($currentPath, $currentFile, $isDir, $isFile) = @_;      my ($currentPath, $currentFile, $isDir, $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.'" />
               <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.'<form method="POST">          $displayOut = $displayOut.'<hr />
  <input type="hidden" name="selectfile"           <form method="POST">
  value="'.$currentFile.'" />          <input type="hidden" name="selectfile" 
  <input type="hidden" name="fileaction" value="delete" />           value="'.$currentFile.'" />
  <center>          <input type="hidden" name="fileaction" value="rename" /> 
  <input type="submit"           <input type="hidden" name="currentpath" value="'.$currentPath.'" /> 
           <input type="input" name="filenewname" value="Type new name here" /> 
  value="Delete '.$currentFile.'" />          <input type="submit" 
  </center>          value="Rename '.$currentFile.'" />
  </form>          </form>
  <hr />          <hr />';
  <form method="POST">      }
  <input type="hidden" name="selectfile"       $displayOut = $displayOut.'<hr />Add a file to '.$currentPath;
  value="'.$currentFile.'" />  
  <input type="hidden" name="fileaction" value="rename" />   
  <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 your portfolio';  
     # file upload form       # file upload form 
     $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';      $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';
     $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.      $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
  '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.          '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.
  '<input type="submit" name="storeupl" value="Upload" />'.          '<input type="submit" name="storeupl" value="Upload" />'.
  '</form><hr>';          '</form><hr />';
     $displayOut = $displayOut.'<form method="POST">      $displayOut = $displayOut.'<form method="POST">
  <input name="subdir" type="text" />          <input name="subdir" type="text" />
  <input type="submit" value="Create Subdirectory" />          <input type="submit" value="Create Subdirectory" />
  </form>          </form>
  ';              ';
     return $displayOut;      return $displayOut;
 }  }
   
 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      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
Line 152  sub handler { Line 166  sub handler {
     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 $isDir;
       my $isEmpty;
     # send header      # send header
     # FIXME need to start using      # FIXME need to start using
     # &Apache::loncommon::content_type()      &Apache::loncommon::no_cache($r);
     $r->content_type('text/html');      &Apache::loncommon::content_type($r, 'text/html');
       &Apache::loncommon::bodytag('Portfolio Managment', 'bgcolor="dogfood"');
   #
   #    $r->content_type('text/html');
     $r->send_http_header;      $r->send_http_header;
     $r->print('<html><head><title>'.  #    $r->print('<html><head><title>'.
               'Portfolio Management'.  #               'Portfolio Management'.
               "</title></head>\n");  #               "</title></head>\n");
   # 
     # FIXME need to start using      # FIXME need to start using
     # &Apache::loncommon::bodytag()  #    $r->print('
     $r->print('  # <body bgcolor="dogfood">
  <body bgcolor="dogfood">  # <blockquote>');
  <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      #grab stuff that was sent
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath', 'currentfile']);
      'currentfile']);  #   $r->print ('<br />CP= '.$ENV{'form.currentpath'}.'<br />');
     $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'}){
  $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');          $r->print('<br />found selectfile'.$ENV{'form.selectfile'} .'<br />');
  # have to check if the selected file is a subdirectory          # have to check if the selected file is a subdirectory
  if ($ENV{'form.selectfile'} =~ /-\(Dir\)/) {          if ($ENV{'form.selectfile'} =~ /-\(Dir\)/){
     # $currentPath =~ /\-\(Dir\)/;              # $currentPath =~ /\-\(Dir\)/;
     $currentPath = $`.'/';              $currentPath = $`.'/';
     $r->print('<br />'.$currentPath.'<br />');              $r->print('<br />'.$currentPath.'<br />');
  }          }
  $currentFile = $ENV{'form.selectfile'};          $currentFile = $ENV{'form.selectfile'};
     } else {      }else{
  $currentFile = '';          $currentFile = '';
     }      }
     # if we're uploading a file, we need to do it early so it will show in the directory list      # 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 ($ENV{'form.uploaddoc.filename'}){
  $r->print($ENV{'form.storeupl'}.'<br />');          $r->print ($ENV{'form.storeupl'}.'<br />');
  $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');          $r->print (&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');  
     }      }
     # similarly, we need to delete or rename files before getting directory list      # similarly, we need to delete or rename files before getting directory list
     if ($ENV{'form.selectfile'}) {      if ($ENV{'form.selectfile'}){
  if ($ENV{'form.fileaction'} eq 'delete') {          if ($ENV{'form.fileaction'} eq 'delete'){
     &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );              $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');
     $currentFile = '';              $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
  } elsif($ENV{'form.fileaction'} eq 'rename') {              $currentFile = '';
     &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );          }elsif($ENV{'form.fileaction'} eq 'rename')  {
     # $r->print('We will rename your file');              &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      # 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 he home server directory structure, specifically
     # the path to the users userfiles directory.      # the path to the users userfiles directory.    
     @dirList = split /<br\s\/>/, (&Apache::lonnet::portfoliolist($currentPath, $currentFile));  #    $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      # 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      # we'll pop them off the bottom of the array, and put them where they belong
           
     # $londcall added to help debug      # $londcall added to help debug, contains the command sent to lond
     my $londcall = pop(@dirList);   #   my $londcall = pop @dirList;
     $r->print('<br />udir '.$londcall.'<br />');   #   $r->print ('<br />udir '.$londcall.'<br />');
     $udir = pop(@dirList);   #   $udir = pop @dirList;
     $r->print('<br />path returned '.$udir.'<br />');   #   $r->print ('<br />path returned '.$udir.'<br />');
     $isFile = pop(@dirList);   #   $isFile = pop @dirList;
 #   $r->print('<br />isfile '.$isFile.'<br />');  #   $r->print ('<br />isfile '.$isFile.'<br />');
     $isDir = pop(@dirList);  #    $isDir = pop @dirList;
 #   $r->print('<br />isdir '.$isDir.'<br />');      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;  #   return OK if $r->header_only;
     # Stuff to maintain proper setting for selected file      # Stuff to maintain proper setting for selected file
     if ($ENV{'form.selectfile'}) {      if ($ENV{'form.selectfile'}){
  if ($ENV{'form.fileaction'} eq 'delete') {          if ($ENV{'form.fileaction'} eq 'delete'){
     &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );              &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );
     $ENV{'portfolio.file'} = 'Selected File Deleted';              $ENV{'portfolio.file'} = 'Selected File Deleted';
  } elsif($ENV{'form.fileaction'} eq 'rename') {          }elsif($ENV{'form.fileaction'} eq 'rename')  {
     &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );              &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'} );
 # $r->print('We will rename your file');  #           $r->print ('We will rename your file');
  } else {          }else{
           
     # Remember user's file selection for later          # Remember user's file selection for later
     $ENV{'portfolio.file'} = $ENV{'form.selectfile'};          $ENV{'portfolio.file'} = $ENV{'form.selectfile'};
     # offer things user can do with selected file          # offer things user can do with selected file
  }          }
     } else {      }else{
  unless ($ENV{'portfolio.file'}) {          unless ($ENV{'portfolio.file'}){
     $ENV{'portfolio.file'} = 'No File Selected';              $ENV{'portfolio.file'} = 'No File Selected';
  }          }
     }      }
     ##############################      ##############################
     #      #
     # Display begins here      # Display begins here
     #      #
     ##############################      ##############################
     $r->print('<hr /> start ');      $r->print ('<hr /> start ');
     $r->print($udir);      $r->print ($udir);
     $r->print('<table border="1"><tr><td>');      $r->print ('<table border=1><tr><td>');
     $r->print(&displayDirectory($currentPath, $currentFile, $isDir, @dirList));      $r->print (displayDirectory ($currentPath, $currentFile, $isDir, @dirList));
     $r->print('</td><td>');      $r->print ('</td>><td>');
     $r->print(&displayActions($currentPath, $currentFile, $isDir, $isFile));      $r->print (displayActions ($currentPath, $currentFile, $isDir, $isEmpty));
     $r->print('</td></tr></table>');      $r->print ('</td>></tr></table>');
     $r->print('<br />end display<br /><hr />');      $r->print ('<br />end display<br /><hr />');
     $r->print('</blockquote></body>');      $r->print ('</blockquote></body>');
     return OK;      return OK;
 }  }
   
Removed from v.1.9  
changed lines
  Added in v.1.10

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