[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.30

version 1.26, 2004/08/24 06:51:11 version 1.30, 2004/08/24 20:57:12
Line 161  sub displayActions { Line 161  sub displayActions {
   
 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 180  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 194  sub display_directory { Line 194  sub display_directory {
       &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);
       }else{
     $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/";
Line 241  sub display_directory { Line 251  sub display_directory {
 #    $r->print('</td>><td>');  #    $r->print('</td>><td>');
 #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));  #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     $r->print('</table></form>');      $r->print('</table></form>');
       }
 }  }
   
 sub open_form {  sub open_form {
Line 269  sub close_form { Line 280  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 291  sub delete_confirmed { Line 305  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'};
       $r->print('<br />'.$directory_name.'<br />');
       $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 '.&display_file().'</font><br />');
     ') while trying to delete '.$directory_name.'</font><br />');
       }
       $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)=@_;
Line 324  sub upload { Line 380  sub upload {
   
 sub createdir {  sub createdir {
     my ($r)=@_;      my ($r)=@_;
     #FIXME 1) bad dirnames ( '/' etc)      #FIXME 1) file exists in place of dir (errormessage needs improvement)
     #      2) file exists in place of dir (errormessage needs improvement)      my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
       if ($newdir eq '') {
    $r->print('<font color="red">'.
     &mt("Error: no valid directory name was provided.").
     '</font><br />');
    $r->print(&done());
    return;
       } 
     my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},      my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
      $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});       $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<font color="red"> An errror occured ('.$result.
   ') while trying to create a new directory '.&display_file().'</font><br />');    ') while trying to create a new directory '.&display_file().'</font><br />');
Line 338  sub createdir { Line 401  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 414  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 '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 383  sub handler { Line 439  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);
          &display_directory($r,$current_path,$is_empty,\@dir_list);
  &display_directory($r,$current_path,\@dir_list);  
   
     }  
   
     $r->print("</body>\n</html>\n");      $r->print("</body>\n</html>\n");
     $r->rflush();      $r->rflush();
     return OK;      return OK;
       }
 }  }
   
 1;  1;
 __END__  __END__
Removed from v.1.26  
changed lines
  Added in v.1.30

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