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

Diff for /loncom/interface/portfolio.pm between versions 1.17 and 1.23

version 1.17, 2004/07/27 05:29:00 version 1.23, 2004/08/24 05:01:42
Line 32  use Apache::lonlocal; Line 32  use Apache::lonlocal;
   
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath  # returns an anchor tag consisting encoding filename and currentpath
 sub makeAnchor{  sub make_anchor {
     my ($fileName, $currentPath) = @_;      my ($filename, $current_path) = @_;
     my $anchor = '<a href="/adm/portfolio?selectfile='.$fileName.'&currentpath='.$currentPath.'">'.$fileName.'</a>';      my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';
     return $anchor;      return $anchor;
 }  }
   
 # returns html with <br /> separated contents of the directory  # returns html with <br /> separated contents of the directory
 # returns a <strong>currentFile</strong> (bolds the selected file/dir)  # returns a <strong>currentFile</strong> (bolds the selected file/dir)
 sub displayDirectory {  sub display_directory {
     my ($currentPath, $currentFile, @dirList,) = @_;      my ($currentPath, $currentFile, @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;
         }          }
                   
Line 63  sub displayDirectory { Line 63  sub displayDirectory {
     foreach my $line (@dirList) {      foreach my $line (@dirList) {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$path,$debug)=split(/\&/,$line,18);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $path =~ m:/:;          if (($filename ne '.') && ($filename ne '..')) {
     my $dirDepth = @-;              if ($testdir =~ m:^1:) {
         if (($fileName ne '.') && ($fileName ne '..')){  
           for (my $i = 0; $i <= $dirDepth; $i += 1){  
            $displayOut.='<blockquote>';  
        }  
             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) {
                     $displayOut.= $debug.'<strong>'.(makeAnchor($fileName.'/', $path.$fileName.'/').'</strong><br />'."\n");      #checks to bold the selected file
                 }else{                      $displayOut.= '<strong>'.(&make_anchor($filename.'/', $filename.'/').'</strong><br />'."\n");
                     $displayOut.= $debug.(makeAnchor($fileName.'/', $path.$fileName.'/').'<br />'."\n");                  } else {
                       $displayOut.= (&make_anchor($filename.'/', $filename.'/').'<br />'."\n");
                 }                  }
             }else{              } else {
                 if ($fileName eq $currentFile){ #checks to bold the selected file                  if ($filename eq $currentFile) {
                     $displayOut.=$debug.'<strong>'.(makeAnchor($fileName, $currentPath).'</strong><br />'."\n");      #checks to bold the selected file
                 }else{                      $displayOut.='<strong>'.(&make_anchor($filename, $currentPath).'</strong><br />'."\n");
                     $displayOut.=$debug.(makeAnchor($fileName, $currentPath).'<br />'."\n");                  } else {
                       $displayOut.=(&make_anchor($filename, $currentPath).'<br />'."\n");
                 }                  }
             }              }
         for (my $i = 0; $i <= $dirDepth; $i += 1){  
            $displayOut.='</blockquote>';  
        }  
                           
         }          }
         
     }      }
     return $displayOut;      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, $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
         # offer the chance to delete the directory only if it is empty          # offer the chance to delete the directory only if it is empty
         if ($isEmpty && ($currentPath ne '/')) {          if ($isEmpty && ($currentPath ne '/')) {
Line 125  sub displayActions { Line 120  sub displayActions {
             value="Rename '.$currentFile.'" />              value="Rename '.$currentFile.'" />
             </form>';              </form>';
         }          }
     }else{  #action options offered for files      } else {  #action options offered for files
         $displayOut = $displayOut.'<form method="POST">';          $displayOut = $displayOut.'<form method="POST">';
         $displayOut = $displayOut.'<input type="hidden" name="selectfile"';          $displayOut = $displayOut.'<input type="hidden" name="selectfile"';
         $displayOut = $displayOut.'value="'.$currentFile;          $displayOut = $displayOut.'value="'.$currentFile;
Line 163  sub displayActions { Line 158  sub displayActions {
             ';              ';
     return $displayOut;      return $displayOut;
 }  }
   
 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 174  sub handler { Line 171  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 $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 196  sub handler { Line 194  sub handler {
     }      }
     if ($ENV{'form.selectfile'}) {      if ($ENV{'form.selectfile'}) {
         # 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 />');
Line 211  sub handler { Line 209  sub handler {
         $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') {
             $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');              $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'}));              $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));
Line 221  sub handler { Line 219  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.    
     #       # 
     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 $done = 0;      @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);
     my $subdir = '';  
     my @workinglist; # intermediate array, holds directory listing lines (dirlist), and path information  
     my $readDirectory = 1; # flag for directory  
     my $loopCounter = 0; # needed only for development to prevent run away program (or maybe more?)  
     while (!$done){  
         # Needed while developing. Later, too?  
         $loopCounter += 1;  
         if ($loopCounter > 50) {  
             $r->print('<br />stop runaway');  
             return OK;  
         }  
         # ---  
         if ($readDirectory){ # is true the first time through, then true if dirlist line is a subdir  
             # $r->print('<br />reading '.$portfolio_root.$subdir);  
             my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$subdir);  
             $r->print('value in @list = '.@list);  
             for (my $i = 0; $i <= @list; $i++ ){  
                 my $line = pop @list;  
                 $line = $line.'&'.$subdir.'&'.$loopCounter; # append the subdirectory information and loopcounter for debug  
                 my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath)=split(/\&/,$line,17);   
                 if (($fileName ne '.') && ($fileName ne '..')){ # we throw away the current and parent directories  
                     $r->print('<br />'.$line); #for debugging  
                     unshift @workinglist, $line; # add the line to the working list array  
                       
                 }else{  
                     $r->print('<br /> parent or current '.$line); #for debugging  
                 }  
             }  
         }  
         $r->print('<br />'.@workinglist.' lines in workinglist');  
         my $line = shift @workinglist; #take one off the working list  
         $r->print('<br />'.@workinglist.' lines in workinglist');  
         if ($line eq '') { # if the working list is empty  
             $done = 1;  
         }else{  
             my ($fileName,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef,$subpath,$debug)=split(/\&/,$line,18);   
             $r->print('<br />'.$fileName.' is '.$testdir);  
             push @dirList, $line; # and put it in the display list  
             if ($testdir =~ m:^1:) { # true if this is a directory  
                 # $r->print('<br />added subdir '.$fileName);  
                 $subdir = $subpath.'/'.$fileName;   
                 $readDirectory = 1;  
             }else{  
                 $readDirectory = 0;  
             }  
         }  
     }  
     # if item is directory {  get the next level down  
     # my @list = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root.$);  
           
     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;
Line 291  sub handler { Line 240  sub handler {
         } 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'});
         } 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';
         }          }
Line 305  sub handler { Line 254  sub handler {
     # Display begins here      # Display begins here
     #      #
     ##############################      ##############################
     $r->print('<table border=1><tr><td>');      $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print(displayDirectory($currentPath, $currentFile, @dirList));      $r->print('<td bgcolor="#ccddaa" align="center">');
     $r->print('</td>><td>');      my $displayOut = '<form method="post" enctype="multipart/form-data">';
     $r->print(displayActions($currentPath, $currentFile, $isEmpty));      $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
     $r->print('</td>></tr></table>');          '<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('</blockquote>');
     $r->print("</body>\n</html>\n");      $r->print("</body>\n</html>\n");
     $r->rflush();      $r->rflush();
Removed from v.1.17  
changed lines
  Added in v.1.23

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