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

Diff for /loncom/interface/portfolio.pm between versions 1.65 and 1.69

version 1.65, 2004/12/12 01:35:44 version 1.69, 2004/12/21 22:34:07
Line 148  sub display_file_select { Line 148  sub display_file_select {
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;      my $display_out;
     my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});      my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
     foreach my $key (keys %$checked_files) {  
         &Apache::lonnet::logthis("a key is $key $$checked_files{$key} is the value");  
     }  
     if ($is_empty && ($current_path ne '/')) {      if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.          $display_out = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.          '<input type="hidden" name="action" value="deletedir" />'.
Line 188  sub display_file_select { Line 185  sub display_file_select {
                 $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"');                   $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
                 if ($$checked_files{$filename} eq 'selected') {                  if ($$checked_files{$filename} eq 'selected') {
                     $r->print("CHECKED");                      $r->print("CHECKED");
                     &Apache::lonnet::logthis("checked");  
                 } else {  
                     &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename");  
                 }                  }
                 $r->print('></td>');                  $r->print('></td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
Line 249  sub display_file { Line 243  sub display_file {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';          $display_file_text = '<tt>'.$path.$filename.'</tt>';
     } elsif (ref($filename) eq "ARRAY") {      } elsif (ref($filename) eq "ARRAY") {
         foreach (@$filename) {          foreach (@$filename) {
             $display_file_text .= '<tt>'.$path.$_.'</tt>';              $display_file_text .= '<tt>'.$path.$_.'</tt><br />';
         }          }
     } elsif (ref($filename) eq "SCALAR") {      } elsif (ref($filename) eq "SCALAR") {
         $display_file_text = '<tt>'.$path.$filename.'</tt>';                  $display_file_text = '<tt>'.$path.$filename.'</tt>';        
Line 270  sub delete { Line 264  sub delete {
     my @check;      my @check;
     my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
   
     if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");          $r->print ("The file is locked and cannot be deleted.<br />");
         $r->print(&done());          $r->print(&done());
     } else {      } else {
         &open_form($r);          if (scalar(@files)) {
         $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');              &open_form($r);
         &close_form($r);              $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
               &close_form($r);
           } else {
               $r->print("No file was checked to delete.<br />");
               $r->print(&done());
           }
     }      }
 }   } 
   
Line 285  sub delete_confirmed { Line 285  sub delete_confirmed {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;      my $result;
     foreach my $delete_file (@files) {      foreach my $delete_file (@files) {
         &Apache::lonnet::logthis("trying to delete $delete_file");  
         $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},          $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
        $ENV{'user.domain'},'portfolio'.         $ENV{'user.domain'},'portfolio'.
        $ENV{'form.currentpath'}.         $ENV{'form.currentpath'}.
Line 366  sub rename_confirmed { Line 365  sub rename_confirmed {
   ') while trying to rename '.&display_file().' to '.    ') while trying to rename '.&display_file().' to '.
   &display_file(undef,$filenewname).'</font><br />');    &display_file(undef,$filenewname).'</font><br />');
     }      }
       if ($filenewname ne $ENV{'form.filenewname'}) {
           $r->print("The new file name was changed from:<br /><strong>".$ENV{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
       }
     $r->print(&done());      $r->print(&done());
 }  }
 sub select_files {  sub select_files {
Line 435  sub upload { Line 437  sub upload {
         }          }
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);      my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
     if (($current_disk_usage + $filesize) > $disk_quota){      if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
         $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.          $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.');                    '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
     }       } 
Line 487  sub createdir { Line 489  sub createdir {
           ') while trying to create a new directory '.&display_file().'</font><br />');            ') while trying to create a new directory '.&display_file().'</font><br />');
         }          }
     }      }
       if ($newdir ne $ENV{'form.newdir'}) {
           $r->print("The new directory name was changed from:<br /><strong>".$ENV{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
       }
     $r->print(&done());      $r->print(&done());
 }  }
   
Removed from v.1.65  
changed lines
  Added in v.1.69

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