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

Diff for /loncom/interface/portfolio.pm between versions 1.26 and 1.27

version 1.26, 2004/08/24 06:51:11 version 1.27, 2004/08/24 07:26:04
Line 269  sub close_form { Line 269  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 300  sub delete_confirmed { Line 303  sub delete_confirmed {
 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)=@_;
Line 338  sub createdir { Line 359  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 $udir; # returned from home server  
     my $currentFile; # directory or file contained in $pathToRoot.$current_path  
     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 357  sub handler { Line 372  sub handler {
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath',
      'currentfile']);       '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 ($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 'rename' && $ENV{'form.confirmed'}) {
  } else {   &rename_confirmed($r);
     &delete($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 383  sub handler { Line 393  sub handler {
  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';
  @dir_list=&Apache::lonnet::dirlist($current_path,$ENV{'user.domain'},   my @dir_list=&Apache::lonnet::dirlist($current_path,
    $ENV{'user.name'},$portfolio_root);      $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);
Removed from v.1.26  
changed lines
  Added in v.1.27

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