Diff for /loncom/interface/portfolio.pm between versions 1.15 and 1.19

version 1.15, 2004/07/09 18:43:40 version 1.19, 2004/07/28 22:30:31
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 and path stub from username/userfiles/portfolio/  
     # returns an anchor tag consisting encoding filename and currentpath  
     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>';
     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      my ($currentPath, $currentFile, @dirList,) = @_;
     # returns a <strong>currentFile</strong> (bolds the selected file/dir)  
     my ($currentPath, $currentFile, $isDir, @dirList,) = @_;  
     my $displayOut='';        my $displayOut='';  
     my $fileName;      my $fileName;
     my $upPath;      my $upPath;
Line 57  sub displayDirectory { Line 56  sub displayDirectory {
             $upPath = $1;              $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 {      } else {
         $displayOut = $displayOut.'at root '.$currentPath.'<br />';          # $displayOut = $displayOut.'at root '.$currentPath.'<br />';
     }      }
     foreach my $line (@dirList) {      foreach my $line (@dirList) {
     #$strip holds directory/file name      #$strip holds directory/file name
Line 69  sub displayDirectory { Line 68  sub displayDirectory {
             if ($testdir =~ m:^1:){              if ($testdir =~ m:^1:){
                 # handle directories different from files                  # handle directories different from files
                 if ($fileName eq $currentFile){ #checks to bold the selected file                  if ($fileName eq $currentFile){ #checks to bold the selected file
                     $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $currentPath.$fileName.'/').'</strong><br />');                      $displayOut.= '<strong>'.(makeAnchor($fileName.'/', $fileName.'/').'</strong><br />'."\n");
                 }else{                  }else{
                     $displayOut.= (makeAnchor($fileName.'/', $currentPath.$fileName.'/').'<br />');                      $displayOut.= (makeAnchor($fileName.'/', $fileName.'/').'<br />'."\n");
                 }                  }
             }else{              }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, $currentPath).'</strong><br />');                      $displayOut.='<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");
                 }else{                  }else{
                     $displayOut.=(makeAnchor($fileName, $currentPath).'<br />');                      $displayOut.=(makeAnchor($fileName, $currentPath).'<br />'."\n");
                 }                  }
             }              }
               
         }          }
         
     }      }
Line 88  sub displayDirectory { Line 88  sub displayDirectory {
 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, $isEmpty) = @_;      my ($currentPath, $currentFile, $isEmpty) = @_;
 #   $displayOut = 'here are actions for '.$currentFile;  #   $displayOut = 'here are actions for '.$currentFile;
     if ($currentFile =~ m:/$:){      if ($currentFile =~ m:/$:){
         # if the selected file is a directory, these are the options          # if the selected file is a directory, these are the options
Line 158  sub displayActions { Line 158  sub displayActions {
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
       my $iconpath= $r->dir_config('lonIconsURL') . "/";
     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 165  sub handler { Line 166  sub handler {
     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;      my $isEmpty;
       my $dirptr=16384;
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Line 214  sub handler { Line 215  sub handler {
         }          }
     }      }
     # 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 the home server directory structure, specifically
     # the path to the users userfiles directory.          # the path to the users userfiles directory.    
       # 
       $r->print('/userfiles/portfolio'.$currentPath.'<br>');
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
      $ENV{'user.name'}).       $ENV{'user.name'}).
        '/userfiles/portfolio';         '/userfiles/portfolio';
     my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);      @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
     @dirList = @list;      
     if (@dirList == 2) { # need to know if directory is empty so 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;          $isEmpty = 1;
     } else {      } else {
         $isEmpty = 0;          $isEmpty = 0;
     }      }
     # 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 );
Line 248  sub handler { Line 251  sub handler {
     # Display begins here      # Display begins here
     #      #
     ##############################      ##############################
     $r->print('<table border=1><tr><td>');      my @tree = split (/\//,$currentPath);
     $r->print(displayDirectory($currentPath, $currentFile, $isDir, @dirList));      $r->print('<font size="+2">'.makeAnchor('portfolio','/').'/');
     $r->print('</td>><td>');      if (@tree > 1){
     $r->print(displayActions($currentPath, $currentFile, $isDir, $isEmpty));          my $newCurrentPath = '';
     $r->print('</td>></tr></table>');          for (my $i = 1; $i< @tree; $i++){
               $newCurrentPath .= $tree[$i].'/';
               $r->print(makeAnchor($tree[$i],'/'.$newCurrentPath).'/');
           }
       }
       $r->print('</font>');
       $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
               '<tr><th>&nbsp;</th><th>Actions</th><th>Name</th><th>Title</th><th>Status</th><th>Last Modified</th></tr>');
       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 ($dirptr&$testdir){
                   $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                   $r->print('<td>Go to ...</td>');
                   $r->print('<td>'.makeAnchor($fileName.'/',$currentPath.$fileName.'/').'</td>'); 
                   $r->print('</tr>'); 
               }else{
                   $r->print('<tr bgcolor="#CCCCFF"><td><img src="'.$iconpath.'unknown.gif"></td>');
                   $r->print('<td>Edit</td>');
                   $r->print('<td>'.$fileName.'</td>'); 
                   $r->print('<td>Title Here</td>');
                   $r->print('<td>Status Here</td>');
                   $r->print('<td>Modified Here</td>');
                   $r->print('</tr>'); 
               }
           }
       }
   #   <tr bgcolor="#FFAA99"> pink bg 
   #   <tr bgcolor="#CCCCFF"> blue bg            
   #   $r->print(displayDirectory($currentPath, $currentFile, @dirList));
   #    $r->print('</td>><td>');
   #   $r->print(displayActions($currentPath, $currentFile, $isEmpty));
       $r->print('</table>');
     $r->print('</blockquote>');      $r->print('</blockquote>');
     $r->print("</body>\n</html>\n");      $r->print("</body>\n</html>\n");
     $r->rflush();      $r->rflush();

Removed from v.1.15  
changed lines
  Added in v.1.19


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