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

Diff for /loncom/interface/portfolio.pm between versions 1.28 and 1.33

version 1.28, 2004/08/24 07:29:51 version 1.33, 2004/08/25 18:48:26
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);
    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/";
Line 255  sub open_form { Line 266  sub open_form {
       $ENV{'form.currentpath'}.'" />');        $ENV{'form.currentpath'}.'" />');
 }  }
   
   sub clean_filename {
       my ($fname)=@_;
   # Replace Windows backslashes by forward slashes
       $fname=~s/\\/\//g;
   # Get rid of everything but the actual filename
       $fname=~s/^.*\/([^\/]+)$/$1/;
   # Replace spaces by underscores
       $fname=~s/\s+/\_/g;
   # Replace all other weird characters by nothing
       $fname=~s/[^\w\.\-]//g;
       return $fname;
   }
   
 sub close_form {  sub close_form {
     my ($r)=@_;      my ($r)=@_;
     $r->print('<p><input type="submit" value="'.&mt('Continue').      $r->print('<p><input type="submit" value="'.&mt('Continue').
Line 294  sub delete_confirmed { Line 318  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 {
           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);
Line 334  sub upload { Line 390  sub upload {
     my ($r)=@_;      my ($r)=@_;
     #FIXME if the file already exists we need to do a confirmation pass       #FIXME if the file already exists we need to do a confirmation pass 
     #before overwriting      #before overwriting
     my $result=&Apache::lonnet::userfileupload('uploaddoc','',      my $fname=$ENV{'form.uploaddoc.filename'};
  'portfolio'.$ENV{'form.currentpath'});      $fname=&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';
    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) {
       #$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 eq $fname){
               $found_file = 1;
           }
       }
       if ($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());
 }  }
Line 366  sub createdir { Line 444  sub createdir {
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
     &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 385  sub handler { Line 466  sub handler {
  &delete_confirmed($r);   &delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {      } elsif ($ENV{'form.action'} eq 'delete') {
  &delete($r);   &delete($r);
       } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
    &delete_dir_confirmed($r);
       } elsif ($ENV{'form.action'} eq 'deletedir'){
    &delete_dir($r);
     } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {      } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
  &rename_confirmed($r);   &rename_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'rename') {      } elsif ($ENV{'form.action'} eq 'rename') {
Line 396  sub handler { Line 481  sub handler {
  if ($ENV{'form.currentpath'}) {   if ($ENV{'form.currentpath'}) {
     $current_path = $ENV{'form.currentpath'};      $current_path = $ENV{'form.currentpath'};
  }   }
   
  my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},  
  $ENV{'user.name'}).  
  '/userfiles/portfolio';  
  my @dir_list=&Apache::lonnet::dirlist($current_path,   my @dir_list=&Apache::lonnet::dirlist($current_path,
     $ENV{'user.domain'},      $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);      $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.28  
changed lines
  Added in v.1.33

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