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

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

version 1.58, 2004/11/25 23:56:19 version 1.69, 2004/12/21 22:34:07
Line 83  sub display_directory { Line 83  sub display_directory {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;      my $display_out;
     my %locked_files=&Apache::lonnet::dump('file_permissions',      my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
                                   $ENV{'user.domain'},$ENV{'user.name'});  
     my $locked_file;  
     foreach my $key (keys %locked_files) {  
         $locked_file .= $locked_files{$key}.':';  
     }  
     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 103  sub display_directory { Line 98  sub display_directory {
     $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";
       $r->print('<form method="post" action="/adm/portfolio">');
     foreach my $line (sort       foreach my $line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
Line 112  sub display_directory { Line 108  sub display_directory {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     if ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){  
        &Apache::lonnet::logthis("found submitted file");  
        &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");  
     } else {  
        &Apache::lonnet::logthis("$filename not found submitted file");  
        &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");  
     }  
     if (($filename ne '.') && ($filename ne '..')) {      if (($filename ne '.') && ($filename ne '..')) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
Line 127  sub display_directory { Line 116  sub display_directory {
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>                  if (exists $locked_files{$current_path.$filename}){
                     <form method="post" action="/adm/portfolio">                      $r->print('<td>Locked</td>');
                     <select name="action">                  } else {
                         <option value=""></option>                      $r->print('<td>Delete<input type="checkbox" name="selectfile" value="'.$filename.'" />
                         <option value="delete">'.&mt("Delete").'</option>                          <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a>                        
                         <option value="rename">'.&mt("Rename").'</option>                          </td>');
                     </select>                  }
                     <input type="submit" name="doit" value="Go" />  
                     <input type="hidden" name="selectfile" value="'.$filename.'" />  
                     <input type="hidden" name="currentpath" value="'.$current_path.'" />  
                     </form>  
                     </td>');  
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><a href="'.$href_location.$filename.'">'.
     $filename.'</a></td>');       $filename.'</a></td>'); 
Line 153  sub display_directory { Line 137  sub display_directory {
 #   $r->print(&display_directory($current_path, $currentFile, @dir_list));  #   $r->print(&display_directory($current_path, $currentFile, @dir_list));
 #    $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>
       <input type="submit" name="doit" value="Delete Checked Files" />
       <input type="hidden" name="action" value="delete" />
       <input type="hidden" name="currentpath" value="'.$current_path.'" />
       </form>');
 }  }
 sub display_file_select {  sub display_file_select {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     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'});
     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 184  sub display_file_select { Line 173  sub display_file_select {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
       $filename =~ s/\s+$//;
     if (($filename ne '.') && ($filename ne '..')) {      if (($filename ne '.') && ($filename ne '..')) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
Line 192  sub display_file_select { Line 182  sub display_file_select {
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>                  $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'"'); 
                         <input type="checkbox" name="selectedfile" value="'.$filename.'" >                  if ($$checked_files{$filename} eq 'selected') {
                     </td>');                      $r->print("CHECKED");
                   }
                   $r->print('></td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><a href="'.$href_location.$filename.'">'.
     $filename.'</a></td>');       $filename.'</a></td>'); 
Line 205  sub display_file_select { Line 197  sub display_file_select {
         }          }
     }      }
     $r->print('</table>      $r->print('</table>
               <input type="hidden" name="continue" value="true">
               <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
               <input type="hidden" name="mode" value="selectfile">
               <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
     </form>');      </form>');
Line 212  sub display_file_select { Line 208  sub display_file_select {
   
 sub open_form {  sub open_form {
     my ($r)=@_;      my ($r)=@_;
       my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     $r->print('<form method="post" action="/adm/portfolio">');      $r->print('<form method="post" action="/adm/portfolio">');
     $r->print('<input type="hidden" name="action" value="'.      $r->print('<input type="hidden" name="action" value="'.
       $ENV{'form.action'}.'" />');        $ENV{'form.action'}.'" />');
     $r->print('<input type="hidden" name="confirmed" value="1" />');      $r->print('<input type="hidden" name="confirmed" value="1" />');
     $r->print('<input type="hidden" name="selectfile" value="'.      foreach (@files) {
       $ENV{'form.selectfile'}.'" />');          $r->print('<input type="hidden" name="selectfile" value="'.
         $_.'" />');
       }
     $r->print('<input type="hidden" name="currentpath" value="'.      $r->print('<input type="hidden" name="currentpath" value="'.
       $ENV{'form.currentpath'}.'" />');        $ENV{'form.currentpath'}.'" />');
 }  }
Line 237  sub close_form { Line 236  sub close_form {
   
 sub display_file {  sub display_file {
     my ($path,$filename)=@_;      my ($path,$filename)=@_;
       my $display_file_text;
     if (!defined($path)) { $path=$ENV{'form.currentpath'}; }      if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
     if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }      if (!defined($filename)) { 
     return '<tt>'.$path.$filename.'</tt>';          $filename=$ENV{'form.selectfile'};
           $display_file_text = '<tt>'.$path.$filename.'</tt>';
       } elsif (ref($filename) eq "ARRAY") {
           foreach (@$filename) {
               $display_file_text .= '<tt>'.$path.$_.'</tt><br />';
           }
       } elsif (ref($filename) eq "SCALAR") {
           $display_file_text = '<tt>'.$path.$filename.'</tt>';        
       }
       return $display_file_text;
 }  }
   
 sub done {  sub done {
Line 254  sub delete { Line 263  sub delete {
     my ($r)=@_;      my ($r)=@_;
     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');
   
     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().'?</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());
           }
     }      }
 }   } 
   
 sub delete_confirmed {  sub delete_confirmed {
     my ($r)=@_;      my ($r)=@_;
     my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
       my $result;
       foreach my $delete_file (@files) {
           $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
        $ENV{'user.domain'},'portfolio'.         $ENV{'user.domain'},'portfolio'.
        $ENV{'form.currentpath'}.         $ENV{'form.currentpath'}.
        $ENV{'form.selectfile'});         $delete_file);
     if ($result ne 'ok') {          if ($result ne 'ok') {
  $r->print('<font color="red"> An error 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(undef, $delete_file).'</font><br />');
           }
     }      }
     $r->print(&done());      $r->print(&done());
 }  }
Line 314  sub delete_dir_confirmed { Line 334  sub delete_dir_confirmed {
   
 sub rename {  sub rename {
     my ($r)=@_;      my ($r)=@_;
     my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
     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 renamed.<br />");          $r->print ("The file is locked and cannot be renamed.<br />");
         $r->print(&done());          $r->print(&done());
Line 339  sub rename_confirmed { Line 359  sub rename_confirmed {
     my $result=      my $result=
  &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},   &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
             'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},              'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
             'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});              'portfolio'.$ENV{'form.currentpath'}.$filenewname);
     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 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 {
     my ($r)=@_;      my ($r)=@_;
     my $java_script =(<<ENDSMP);      if ($ENV{'form.continue'} eq 'true') {
           # here we update the selections for the currentpath
           # eventually, have to handle removing those not checked, but . . . 
           my @items=&Apache::loncommon::get_env_multiple('form.selectfile');
           &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
       } else {
           if ($ENV{'form.currentpath'} eq '/') {
               #empty the file for a fresh start
               # &Apache::lonnet::clear_selected_files($ENV{'user.name'});
           }
       }
       my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
       my $java_files = join ",", @files;
       if ($java_files) {
           $java_files.=',';
       }
       my $javascript =(<<ENDSMP);
         <script language='javascript'>          <script language='javascript'>
         function finishSelect() {          function finishSelect() {
             fileList = "";  ENDSMP
       $javascript .= 'fileList = "'.$java_files.'";';
       $javascript .= (<<ENDSMP);
             for (i=0;i<document.forms.checkselect.length;i++) {               for (i=0;i<document.forms.checkselect.length;i++) { 
                 if (document.forms.checkselect[i].checked){                  if (document.forms.checkselect[i].checked){
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;                      fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
Line 360  sub select_files { Line 401  sub select_files {
             }              }
             opener.document.forms.lonhomework.              opener.document.forms.lonhomework.
 ENDSMP  ENDSMP
     $java_script .= $ENV{'form.fieldname'};      $javascript .= $ENV{'form.fieldname'};
     $java_script .= (<<ENDSMP);      $javascript .= (<<ENDSMP);
         .value=fileList;          .value=fileList;
             self.close();              self.close();
         }          }
         </script>          </script>
 ENDSMP  ENDSMP
     $r->print($java_script);      $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>      $r->print("<h1>Select portfolio files</h1>
                 Check as many as you wish in response to the essay problem.<br />");                  Check as many as you wish in response to the essay problem.<br />");
       $r->print("<strong>Files selected from other directories:</strong><br />");
       foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
           $r->print($_."<br />");
       }
 }  }
 sub upload {  sub upload {
     my ($r)=@_;      my ($r)=@_;
Line 392  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 444  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());
 }  }
   
Line 464  sub handler { Line 512  sub handler {
     $r->rflush();      $r->rflush();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath',
      'currentfile','action','fieldname','mode']);       'currentfile','action','fieldname','mode','rename']);
  if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){   if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
        $r->print('<font color="red"> No file was selected to upload.'.         $r->print('<font color="red"> No file was selected to upload.'.
                'To upload a file, click <strong>Browse...</strong>'.                 'To upload a file, click <strong>Browse...</strong>'.
Line 482  sub handler { Line 530  sub handler {
  &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.rename'}) {
           $ENV{'form.selectfile'} = $ENV{'form.rename'};
           $ENV{'form.action'} = 'rename';
  &rename($r);   &rename($r);
     } elsif ($ENV{'form.createdir'}) {      } elsif ($ENV{'form.createdir'}) {
  &createdir($r);   &createdir($r);
Removed from v.1.58  
changed lines
  Added in v.1.69

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