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

Diff for /loncom/interface/portfolio.pm between versions 1.30 and 1.32

version 1.30, 2004/08/24 20:57:12 version 1.32, 2004/08/25 17:30:49
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){      if ($is_empty) {
         $displayOut = '<form method="post" action="/adm/portfolio">'.          $displayOut = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.          '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.          '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
Line 203  sub display_directory { Line 203  sub display_directory {
         '</form>';          '</form>';
                   
         $r->print($displayOut);          $r->print($displayOut);
     }else{   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 251  sub display_directory { Line 252  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 321  sub delete_dir { Line 321  sub delete_dir {
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
     my ($r)=@_;      my ($r)=@_;
     my $directory_name = $ENV{'form.currentpath'};      my $directory_name = $ENV{'form.currentpath'};
     $r->print('<br />'.$directory_name.'<br />');  
     $directory_name =~ m/\/$/;      $directory_name =~ m/\/$/;
     $directory_name = $`;      $directory_name = $`;
     my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},      my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
        $ENV{'user.domain'},'portfolio'.         $ENV{'user.domain'},'portfolio'.
        $directory_name);         $directory_name);
          
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured (dir) ('.$result.   $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 />');    ') 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());      $r->print(&done());
 }  }
Line 421  sub handler { Line 429  sub handler {
     } 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'}) {      } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
     &delete_dir_confirmed($r);   &delete_dir_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'deletedir'){      } elsif ($ENV{'form.action'} eq 'deletedir'){
     &delete_dir($r);   &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 445  sub handler { Line 453  sub handler {
           
  # 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,$is_empty,\@dir_list);
     $r->print("</body>\n</html>\n");   $r->print("</body>\n</html>\n");
     $r->rflush();   return OK;
     return OK;  
     }      }
 }  }
 1;  1;
Removed from v.1.30  
changed lines
  Added in v.1.32

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