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

Diff for /loncom/interface/portfolio.pm between versions 1.25 and 1.43

version 1.25, 2004/08/24 06:43:21 version 1.43, 2004/09/10 20:14:45
Line 38  sub make_anchor { Line 38  sub make_anchor {
     return $anchor;      return $anchor;
 }  }
   
 # 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 {  
     # returns html to offer user appropriate actions depending on selected file/directory  
     my $displayOut;  
     my ($currentPath, $currentFile, $isEmpty) = @_;  
 #   $displayOut = 'here are actions for '.$currentFile;  
     if ($currentFile =~ m:/$:) {  
         # if the selected file is a directory, these are the options  
         # offer the chance to delete the directory only if it is empty  
         if ($isEmpty && ($currentPath ne '/')) {  
             $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.'<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;  my $dirptr=16384;
 sub display_directory {  sub display_directory {
     my ($r,$current_path,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');      $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');      $r->print('<td bgcolor="#ccddaa" align="center">');
Line 180  sub display_directory { Line 59  sub display_directory {
     $r->print($displayOut);      $r->print($displayOut);
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor('/','/'));      $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
Line 190  sub display_directory { Line 69  sub display_directory {
     }      }
     $r->print('</font>');      $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
       #Fixme -- remove from recent those paths that are deleted
     $r->print('<br /><form method=post action="/adm/portfolio">'.      $r->print('<br /><form method=post action="/adm/portfolio">'.
       &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',        &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
     'this.form.submit();'));      'this.form.submit();'));
     $r->print("</form>");      $r->print("</form>");
       if ($is_empty) {
           $displayOut = '<form method="post" action="/adm/portfolio">'.
           '<input type="hidden" name="action" value="deletedir" />'.
           '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
           '<input type="hidden" name="selectfile" value="" />'.
           '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '</form>';
           
           $r->print($displayOut);
    return;
       }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.      $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>');              '<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/";      my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
     foreach my $line (@$dir_list) {      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      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
Line 210  sub display_directory { Line 106  sub display_directory {
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>                  $r->print('<td>
 <form method="post" action="/adm/portfolio">                      <form method="post" action="/adm/portfolio">
 <select name="action">                      <select name="action">
   <option value=""></option>                          <option value=""></option>
   <option value="delete">'.&mt("Delete").'</option>                          <option value="delete">'.&mt("Delete").'</option>
   <option value="rename">'.&mt("Rename").'</option>                          <option value="rename">'.&mt("Rename").'</option>
 </select>                      </select>
 <input type="submit" name="doit" value="Go" />                      <input type="submit" name="doit" value="Go" />
 <input type="hidden" name="selectfile" value="'.$filename.'" />                      <input type="hidden" name="selectfile" value="'.$filename.'" />
 <input type="hidden" name="currentpath" value="'.$current_path.'" />                      <input type="hidden" name="currentpath" value="'.$current_path.'" />
 </form>                      </form>
 </td>');                      </td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><a href="'.$href_location.$filename.'">'.
   $filename.'</a></td>');       $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');                  $r->print('<td>'.$size.'</td>');
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');                  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                 $r->print('</tr>');                   $r->print('</tr>'); 
Line 264  sub close_form { Line 160  sub close_form {
 }  }
   
 sub display_file {  sub display_file {
     return $ENV{'form.currentpath'}.$ENV{'form.selectfile'};      my ($path,$filename)=@_;
       if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
       if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
       return '<tt>'.$path.$filename.'</tt>';
 }  }
   
 sub done {  sub done {
Line 286  sub delete_confirmed { Line 185  sub delete_confirmed {
        $ENV{'form.currentpath'}.         $ENV{'form.currentpath'}.
        $ENV{'form.selectfile'});         $ENV{'form.selectfile'});
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<font color="red"> An error occured ('.$result.
   ') while trying to delete '.&display_file().'</font><br />');    ') while trying to delete '.&display_file().'</font><br />');
     }      }
     $r->print(&done());      $r->print(&done());
 }  }
   
   sub delete_dir {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
       &close_form($r);
   } 
   
   sub delete_dir_confirmed {
       my ($r)=@_;
       my $directory_name = $ENV{'form.currentpath'};
       $directory_name =~ m/\/$/;
       $directory_name = $`;
       my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio'.
          $directory_name);
          
       if ($result ne 'ok') {
    $r->print('<font color="red"> An error occured (dir) ('.$result.
     ') while trying to delete '.$directory_name.'</font><br />');
       } else {
           # now remove from recent
   #        $r->print('<br /> removing '.$directory_name.'<br /');
           &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
           my @dirs = split m!/!, $directory_name;
           
   #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
           $directory_name='/';
           for (my $i=1; $i < (@dirs - 1); $i ++){
               $directory_name .= $dirs[$i].'/';
           }
           $ENV{'form.currentpath'} = $directory_name;
       }
       $r->print(&done());
   }
   
 sub rename {  sub rename {
     my ($r)=@_;      my ($r)=@_;
     &open_form($r);      &open_form($r);
     $r->print('<p>'.&mt('Rename').' '.&display_file().'?</p>');      $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                  <input name="filenewname" type="input" size="50" />?</p>');
     &close_form($r);      &close_form($r);
 }  }
   
 sub rename_confirmed {  sub rename_confirmed {
     my ($r)=@_;      my ($r)=@_;
     &Apache::lonnet::renameuserfile($ENV{'form.currentpath'}.$ENV{'form.selectfile'}, 'rename', $ENV{'form.currentpath'}.$ENV{'form.filenewname'} );      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 {  sub upload {
     my ($r)=@_;      my ($r)=@_;
     #FIXME if the file already exists we need to do a confirmation pass       my $fname=$ENV{'form.uploaddoc.filename'};
     #before overwriting      my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $result=&Apache::lonnet::userfileupload('uploaddoc','',      my $disk_quota = 20000; # expressed in k
  'portfolio'.$ENV{'form.currentpath'});      $fname=&Apache::lonnet::clean_filename($fname);
     if ($result !~ m|^/uploaded/|) {      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
  $r->print('<font color="red"> An errror occured ('.$result.   $ENV{'user.name'}).
   ') while trying to upload '.&display_file().'</font><br />');   '/userfiles/portfolio';
       # Fixme --- Move the checking for existing file to LOND error return
       my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
     $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);
       my $found_file = 0;
       foreach my $line (@dir_list) {
           my ($filename)=split(/\&/,$line,2);
           if ($filename eq $fname){
               $found_file = 1;
           }
       }
       my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
       if (($current_disk_usage + $filesize) > $disk_quota){
           $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
                     '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
       } 
       elsif ($found_file){   
           $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
                     '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
       } else {
           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());      $r->print(&done());
 }  }
   
 sub createdir {  sub createdir {
     my ($r)=@_;      my ($r)=@_;
     #FIXME 1) bad dirnames      my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
     #      2) file exists in place of dir      if ($newdir eq '') {
     my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},      $r->print('<font color="red">'.
      $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});        &mt("Error: no directory name was provided.").
     if ($result ne 'ok') {        '</font><br />');
  $r->print('<font color="red"> An errror occured ('.$result.      $r->print(&done());
   ') while trying to create a new directory '.&display_file().'</font><br />');      return;
       } 
       my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
       my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
     $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);
       my $found_file = 0;
       foreach my $line (@dir_list) {
           my ($filename)=split(/\&/,$line,2);
           if ($filename eq $newdir){
               $found_file = 1;
           }
       }
       if ($found_file){
          $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.
                  ' </strong>a file or directory by that name already exists.</font><br />');
       } else {
           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());      $r->print(&done());
 }  }
Line 333  sub createdir { Line 335  sub createdir {
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
     my @dir_list; # will hold directory listing as array   my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
     my $udir; # returned from home server   $ENV{'user.name'}).
     my $currentFile; # directory or file contained in $pathToRoot.$current_path   '/userfiles/portfolio';
     my $action; # delete, rename, makedirectory, removedirectory,  
     my $filenewname; # for rename action (guess what we do with it!)  
     my $isFile;  
     &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 351  sub handler { Line 350  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath',
      'currentfile']);       'currentfile']);
    if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
     # if we're uploading a file, we need to do it early so it will         $r->print('<font color="red"> No file was selected to upload.'.
     # show in the directory list                 'To upload a file, click <strong>Browse...</strong>'.
                  ', select a file, then click <strong>Upload</strong>,</font>');
    }
     if ($ENV{'form.uploaddoc.filename'}) {      if ($ENV{'form.uploaddoc.filename'}) {
  &upload($r);   &upload($r);
       } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
    &delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {      } elsif ($ENV{'form.action'} eq 'delete') {
  if ($ENV{'form.confirmed'}) {   &delete($r);
     &delete_confirmed($r);      } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
  } else {   &delete_dir_confirmed($r);
     &delete($r);      } elsif ($ENV{'form.action'} eq 'deletedir'){
  }   &delete_dir($r);
       } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
    &rename_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'rename') {      } elsif ($ENV{'form.action'} eq 'rename') {
  # similarly, we need to delete or rename files before getting  
  # directory list  
  &rename($r);   &rename($r);
     } elsif ($ENV{'form.createdir'}) {      } elsif ($ENV{'form.createdir'}) {
  &createdir($r);   &createdir($r);
Line 374  sub handler { Line 376  sub handler {
  if ($ENV{'form.currentpath'}) {   if ($ENV{'form.currentpath'}) {
     $current_path = $ENV{'form.currentpath'};      $current_path = $ENV{'form.currentpath'};
  }   }
    my @dir_list=&Apache::lonnet::dirlist($current_path,
  my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},      $ENV{'user.domain'},
  $ENV{'user.name'}).      $ENV{'user.name'},$portfolio_root);
  '/userfiles/portfolio';      if (@dir_list[0] eq 'no_such_dir'){
  @dir_list=&Apache::lonnet::dirlist($current_path,$ENV{'user.domain'},          # two main reasons for this: 1) never been here, so directory structure not created
    $ENV{'user.name'},$portfolio_root);          #                            2) back-button navigation after deleting a directory
               if ($current_path eq '/'){
           &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
           $ENV{'user.domain'},'portfolio');
           }else{ # some directory that snuck in
               # get rid of the directory from the recent pulldown, just in case
               &Apache::lonhtmlcommon::remove_recent('portfolio',[$current_path]);
               $current_path = '/'; # force it back to the root        
           }
           # now grab the directory list again, for the first time
       @dir_list=&Apache::lonnet::dirlist($current_path,
       $ENV{'user.domain'},
       $ENV{'user.name'},$portfolio_root);
           
       }
  # need to know if directory is empty so it can be removed if desired   # need to know if directory is empty so it can be removed if desired
  my $is_empty=(@dir_list == 2);   my $is_empty=(@dir_list == 2);
       &display_directory($r,$current_path,$is_empty,\@dir_list);
  &display_directory($r,$current_path,\@dir_list);   $r->print("</body>\n</html>\n");
    return OK;
     }      }
   
     $r->print("</body>\n</html>\n");  
     $r->rflush();  
     return OK;  
 }  }
   
 1;  1;
 __END__  __END__
Removed from v.1.25  
changed lines
  Added in v.1.43

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