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

Diff for /loncom/interface/portfolio.pm between versions 1.192 and 1.196

version 1.192, 2008/04/17 14:46:18 version 1.196, 2008/11/17 17:04:20
Line 93  sub display_common { Line 93  sub display_common {
  'Upload file to current directory:',   'Upload file to current directory:',
  'createdir' => 'Create Subdirectory',   'createdir' => 'Create Subdirectory',
  'createdir_label' =>    'createdir_label' => 
  'Create subdirectory in current directory:');   'Create subdirectory in current directory:',
                                            'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
                                               );
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');          my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
  my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');   my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
  my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');   my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
Line 101  sub display_common { Line 103  sub display_common {
  # FIXME: This line should be deleted once Portfolio uses breadcrumbs   # FIXME: This line should be deleted once Portfolio uses breadcrumbs
  $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));   $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));
   
           my $parse_check;
           if (!&suppress_embed_prompt()) {
               $parse_check = <<"END";
           <br />
           <span class="LC_nobreak">
            <label>$text{'parse'}
            <input type="checkbox" name="parserflag" checked="checked" />
            </label>
           </span>
   END
           }
         $r->print(<<"TABLE");           $r->print(<<"TABLE"); 
 <table id="LC_portfolio_actions">  <table id="LC_portfolio_actions">
   <tr id="LC_portfolio_upload">    <tr id="LC_portfolio_upload">
Line 115  sub display_common { Line 128  sub display_common {
  <input type="hidden" name="action" value="$env{"form.action"}" />   <input type="hidden" name="action" value="$env{"form.action"}" />
  <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />   <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
  <input type="hidden" name="mode" value="$env{"form.mode"}" />   <input type="hidden" name="mode" value="$env{"form.mode"}" />
  <input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload   <input type="submit" name="storeupl" value="$text{'upload'}" />
   $help_fileupload
   $parse_check
       </form>        </form>
     </td>      </td>
   </tr>    </tr>
Line 450  sub display_directory { Line 465  sub display_directory {
         $r->print('</table>');          $r->print('</table>');
         if ($can_delete) {          if ($can_delete) {
             $r->print('              $r->print('
         <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.          <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
  &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'   &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />          <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />          <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 1801  sub check_for_upload { Line 1816  sub check_for_upload {
 sub upload {  sub upload {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});      my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
       my $disk_quota = &get_quota($group);
     my ($state,$msg) = &check_for_upload($env{'form.currentpath'},      my $portfolio_root = &get_portfolio_root();
  $fname,$group,'uploaddoc');      my $port_path = &get_port_path();
       my ($uname,$udom) = &get_name_dom($group);
       my $getpropath = 1;
       my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       my ($state,$msg) = 
           &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
                                $group,'uploaddoc',$portfolio_root,
                                                $port_path,$disk_quota,
                                                $current_disk_usage,$uname,$udom);
     if ($state eq 'will_exceed_quota'      if ($state eq 'will_exceed_quota'
  || $state eq 'file_locked'   || $state eq 'file_locked'
  || $state eq 'file_exists' ) {   || $state eq 'file_exists' ) {
Line 1812  sub upload { Line 1834  sub upload {
  return;   return;
     }      }
   
     my $port_path = &get_port_path();  
     my (%allfiles,%codebase,$mode);      my (%allfiles,%codebase,$mode);
     if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {      if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
  $mode = 'parse';          if ($env{'form.parserflag'}) {
       $mode = 'parse';
           }
     }      }
     my $result=      my $result=
  &Apache::lonnet::userfileupload('uploaddoc','',   &Apache::lonnet::userfileupload('uploaddoc','',
Line 1828  sub upload { Line 1850  sub upload {
  $r->print(&done('Back',$url));   $r->print(&done('Back',$url));
     } else {      } else {
  if (%allfiles) {   if (%allfiles) {
     my $state = <<STATE;              if (!&suppress_embed_prompt()) {
           my $state = <<STATE;
     <input type="hidden" name="action"      value="upload_embedded" />      <input type="hidden" name="action"      value="upload_embedded" />
     <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />      <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
     <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />      <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
     <input type="hidden" name="mode"        value="$env{'form.mode'}" />      <input type="hidden" name="mode"        value="$env{'form.mode'}" />
 STATE  STATE
             $r->print("<h2>".&mt("Reference Warning")."</h2>");                  $r->print("<h2>".&mt("Reference Warning")."</h2>");
             $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");                  $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
             $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");                  $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
     $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,          $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
       {'error_on_invalid_names'   => 1,        {'error_on_invalid_names'   => 1,
        'ignore_remote_references' => 1,}));         'ignore_remote_references' => 1,}));
     $r->print('<p>Or '.&done('Return to directory',$url).'</p>');          $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
               }
  } else {   } else {
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
  }   }
     }      }
 }  }
   
 sub upload_embedded {  
     my ($r,$url,$group)=@_;  
     for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {  
  next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));  
  my $orig_uploaded_filename =   
     $env{'form.embedded_item_'.$i.'.filename'};  
   
  $env{'form.embedded_orig_'.$i} =   
     &unescape($env{'form.embedded_orig_'.$i});  
  my ($path,$fname) =   
     ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});  
  # no path, whole string is fname  
  if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };  
   
  $path = $env{'form.currentpath'}.$path;  
  $fname = &Apache::lonnet::clean_filename($fname);  
   
  my ($state,$msg) = &check_for_upload($path,$fname,$group,  
      'embedded_item_'.$i);  
   
  if ($state eq 'will_exceed_quota'  
     || $state eq 'file_locked'  
     || $state eq 'file_exists' ) {  
     $r->print($msg);  
     next;  
  }  
   
  my $port_path = &get_port_path();  
  my $src_path = $env{'form.embedded_orig_'.$i};  
  $env{'form.embedded_item_'.$i.'.filename'}=$fname;  
   
  my $result=  
     &Apache::lonnet::userfileupload('embedded_item_'.$i,'',  
     $port_path.$path);  
  if ($result !~ m|^/uploaded/|) {  
     $r->print('<span class="LC_error">'  
                       .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'  
                            ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})  
                       .'</span><br />');  
     next;  
  } else {  
     $r->print("<p> Uploaded ".  
       &display_file($port_path.$path,$fname).'</p>');  
  }  
     }  
     $r->print(&done(undef,$url));  
 }  
   
 sub lock_info {  sub lock_info {
     my ($r,$url,$group) = @_;      my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 2134  sub get_quota { Line 2110  sub get_quota {
     return $disk_quota;      return $disk_quota;
 }  }
   
   sub suppress_embed_prompt {
       my $suppress_prompt = 0;
       if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
           if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
               $suppress_prompt = 1;
           }
       }
       return $suppress_prompt;
   }
   
   
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
Line 2258  sub handler { Line 2245  sub handler {
         }          }
     } elsif ($env{'form.action'} eq 'upload_embedded') {      } elsif ($env{'form.action'} eq 'upload_embedded') {
  if ($can_upload) {   if ($can_upload) {
     &upload_embedded($r,$url,$group);              my $disk_quota = &get_quota($group);
               my $getpropath = 1;
               my $current_disk_usage = 
                   &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       $r->print(
                   &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
                       $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
               $r->print(&done(undef,$url));
         } else {          } else {
             &missing_priv($r,$url,'upload');              &missing_priv($r,$url,'upload');
         }          }
Removed from v.1.192  
changed lines
  Added in v.1.196

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