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

Diff for /loncom/interface/portfolio.pm between versions 1.191 and 1.199

version 1.191, 2008/04/16 23:11:06 version 1.199, 2008/11/28 18:18:39
Line 87  sub display_common { Line 87  sub display_common {
         my $groupitem = &group_form_data();          my $groupitem = &group_form_data();
   
         my $iconpath= $r->dir_config('lonIconsURL') . "/";          my $iconpath= $r->dir_config('lonIconsURL') . "/";
         my %text=&Apache::lonlocal::texthash(          my %lt=&Apache::lonlocal::texthash(
  'upload' => 'Upload',   'upload' => 'Upload',
  'upload_label' =>     'upload_label' => '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 102  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')));
   
         $r->print(<<"TABLE");           my $parse_check;
 <table id="LC_portfolio_actions">          if (!&suppress_embed_prompt()) {
   <tr id="LC_portfolio_upload">              $parse_check = <<"END";
     <td class="LC_label">          <br />
       $text{'upload_label'}          <span class="LC_nobreak">
     </td>           <label>$lt{'parse'}
     <td class="LC_value">           <input type="checkbox" name="parserflag" checked="checked" />
       <form method="post" enctype="multipart/form-data" action="$escuri">           </label>
         $groupitem           </span>
         <input name="uploaddoc" type="file" />  END
  <input type="hidden" name="currentpath" value="$current_path" />          }
  <input type="hidden" name="action" value="$env{"form.action"}" />  
  <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />          $r->print('<div>');
  <input type="hidden" name="mode" value="$env{"form.mode"}" />          # Upload File
  <input type="submit" name="storeupl" value="$text{'upload'}" />$help_fileupload          $r->print('<div class="LC_left_float">'
       </form>                   .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
     </td>                   .'<fieldset>'
   </tr>                   .'<legend>'.$lt{'upload_label'}.'</legend>'
   <tr id="LC_portfolio_createdir">                   .$groupitem 
     <td class="LC_label">                   .'<input name="uploaddoc" type="file" />'
       $text{'createdir_label'}                   .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
     </td>                   .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
     <td class="LC_value">                   .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
       <form method="post" action="$escuri">                   .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
         <input name="newdir" type="input" />$groupitem                   .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
         <input type="hidden" name="currentpath" value="$current_path" />                   .$help_fileupload
         <input type="hidden" name="action" value="$env{"form.action"}" />                   .$parse_check
         <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />                   .'</fieldset>'
         <input type="hidden" name="mode" value="$env{"form.mode"}" />                   .'</form>'
         <input type="submit" name="createdir" value="$text{'createdir'}" />$help_createdir                   .'</div>'
       </form>          );
     </td>          # Create Subdirectory
   </tr>          $r->print('<div class="LC_left_float">'
 </table>                   .'<form method="post" action="'.$escuri.'">'
 TABLE                   .'<fieldset>'
     }                   .'<legend>'.$lt{'createdir_label'}.'</legend>'
                    .'<input name="newdir" type="input" />'.$groupitem
                    .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                    .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
                    .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                    .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                    .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
                    .$help_createdir
                    .'</fieldset>'
                    .'</form>'
                    .'</div>'
           );
           $r->print('</div>');
       } # end "if can_upload"
   
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     my %anchor_fields = (      my %anchor_fields = (
         'selectfile'    => $port_path,          'selectfile'    => $port_path,
Line 176  sub display_directory_line { Line 191  sub display_directory_line {
  $href_location, $url, $current_path, $access_admin_text, $versions)=@_;   $href_location, $url, $current_path, $access_admin_text, $versions)=@_;
   
     my $fullpath =  &prepend_group($current_path.$filename);      my $fullpath =  &prepend_group($current_path.$filename);
     $r->print('<tr class="'.$css_class.'">');      $r->print(&Apache::loncommon::start_data_table_row());
     $r->print($line); # contains first two cells of table      $r->print($line); # contains first two cells of table
     my $lock_info;      my $lock_info;
     if ($version_flag) { # versioned can't be versioned, so TRUE when root file      if ($version_flag) { # versioned can't be versioned, so TRUE when root file
Line 212  sub display_directory_line { Line 227  sub display_directory_line {
     $r->print('<td>'.$size.'</td>');      $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');      $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
     if ($select_mode ne 'true') {      if ($select_mode ne 'true') {
  $r->print('<td><span style="white-space: nowrap">'.          $r->print('<td class="'.$css_class.'">&nbsp;&nbsp;</td>'); # Display status
   &mt($curr_access).'&nbsp;&nbsp;&nbsp;');          $r->print('<td><span class="LC_nobreak">'
                    .&mt($curr_access).'&nbsp;&nbsp;&nbsp;'
          );
         my %anchor_fields = (          my %anchor_fields = (
             'access' => $filename,              'access' => $filename,
             'currentpath' => $current_path              'currentpath' => $current_path
         );          );
  $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');   $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
       } else {
           $r->print('<td class="'.$css_class.'">&nbsp;&nbsp;</td>'); # Display status
     }      }
     $r->print('</tr>'.$/);      $r->print(&Apache::loncommon::end_data_table_row().$/);
 }  }
   
 sub display_directory {  sub display_directory {
Line 252  sub display_directory { Line 271  sub display_directory {
         $display_out = '<form method="post" action="'.$url.'">'.          $display_out = '<form method="post" action="'.$url.'">'.
     &group_form_data().      &group_form_data().
         '<input type="hidden" name="action" value="deletedir" />'.          '<input type="hidden" name="action" value="deletedir" />'.
           '<p>'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.          '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
           '</p>'.
         '<input type="hidden" name="selectfile" value="" />'.          '<input type="hidden" name="selectfile" value="" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '</form>';          '</form>';
Line 262  sub display_directory { Line 283  sub display_directory {
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');          $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.          $r->print(&Apache::loncommon::start_data_table()
             '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');                   .&Apache::loncommon::start_data_table_header_row()
                    .'<th>'.&mt('Select').'</th>'
                    .'<th>&nbsp;</th><th>&nbsp;</th>'
                    .'<th>'.&mt('Name').'</th>'
                    .'<th>'.&mt('Size').'</th>'
                    .'<th>'.&mt('Last Modified').'</th>'
                    .'<th>&nbsp;</th>'
                    .&Apache::loncommon::end_data_table_header_row()
           );
     } else {      } else {
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
  $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',   $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
       &mt('Using the portfolio file list')));        &mt('Using the portfolio file list')));
         $r->print('<table id="LC_browser">'.          $r->print(&Apache::loncommon::start_data_table()
                   '<tr>'                   .&Apache::loncommon::start_data_table_header_row()
                  .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'                   .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
                  .'<th>&nbsp;</th><th>&nbsp;</th>'                   .'<th>&nbsp;</th><th>&nbsp;</th>'
                  .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'                   .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
                  .'<th>'.&mt('Size').'</th>'                   .'<th>'.&mt('Size').'</th>'
                  .'<th>'.&mt('Last Modified').'</th>'                   .'<th>'.&mt('Last Modified').'</th>'
                    .'<th>&nbsp;</th>'
                  .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'                   .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
                  .'</tr>');                   .&Apache::loncommon::end_data_table_header_row());
     }      }
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
Line 334  sub display_directory { Line 364  sub display_directory {
            $version_flag = '&nbsp;';             $version_flag = '&nbsp;';
        }         }
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
  my $colspan='colspan="2"';   my $colspan_folder='';
    my $colspan_fill='';
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
     undef($colspan);                      $colspan_fill=' colspan="3"';
                   } else {
                       $colspan_folder=' colspan="2"';
                       $colspan_fill=' colspan="4"';
                 }                  }
  $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');   $r->print('<tr class="LC_browser_folder">');
                 $r->print('<td>'.&mt('Go to ...').'</td>');                  $r->print('<td'.$colspan_folder.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>'
                            .'<td>'.&mt('Go to ...').'</td>');
                 my %anchor_fields = (                  my %anchor_fields = (
                     'selectfile'    => $filename.'/',                      'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',                      'currentpath'   => $current_path.$filename.'/',
Line 347  sub display_directory { Line 382  sub display_directory {
                     'fieldname'     => $env{"form.fieldname"},                      'fieldname'     => $env{"form.fieldname"},
                     'continue'      => $env{"form.continue"}                      'continue'      => $env{"form.continue"}
                 );                    );  
                 $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');                   $r->print('<td>'.$version_flag.'</td>'
                            .'<td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
                   $r->print('<td'.$colspan_fill.'>&nbsp;</td>');
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
  my $css_class = 'LC_browser_file';   my $css_class = 'LC_browser_file';
Line 355  sub display_directory { Line 392  sub display_directory {
                 if ($select_mode eq 'true') {                  if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';                      $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
     if ($$checked_files{$filename} eq 'selected') {      if ($$checked_files{$filename} eq 'selected') {
                         $line.=" checked ";                          $line.=' checked="checked" ';
                     }                      }
     $line.=' /></td>';      $line.=' /></td>';
                 } else {                  } else {
Line 438  sub display_directory { Line 475  sub display_directory {
         }          }
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('</table>          $r->print(&Apache::loncommon::end_data_table().'
             <input type="hidden" name="continue" value="true" />              <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />              <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
             <input type="hidden" name="mode" value="selectfile" />              <input type="hidden" name="mode" value="selectfile" />
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />              <p>
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
               <input type="button" name="doit" onClick= "finishSelect();" value="'.&mt('Select checked files, and close window').'" />
               </p>
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>');                  </form>');        
     } else {      } else {
         $r->print('</table>');          $r->print(&Apache::loncommon::end_data_table());
         if ($can_delete) {          if ($can_delete) {
             $r->print('              $r->print('
         <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.          <p>
           <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
  &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'   &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
           </p>
         <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.'" />
         </form>'          </form>'
Line 1738  ENDSMP Line 1779  ENDSMP
         </script>          </script>
 ENDSMP  ENDSMP
     $r->print($javascript);      $r->print($javascript);
     $r->print("<h1>".&mt('Select portfolio files')."</h1>".      $r->print("<h1>".&mt('Select portfolio files')."</h1>");
                 &mt('Check as many as you wish in response to the problem.')."<br />");  
     my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});      my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
     if (@otherfiles) {      if (@otherfiles) {
  $r->print("<strong>".&mt('Files selected from other directories:')."</strong><br />");   $r->print(&Apache::loncommon::start_data_table()
                    .&Apache::loncommon::start_data_table_header_row()
                    .'<th>'.&mt('Files selected from other directories:')."</th>"
                    .&Apache::loncommon::end_data_table_header_row()
           );
  foreach my $file (@otherfiles) {   foreach my $file (@otherfiles) {
     $r->print($file."<br />");      $r->print(&Apache::loncommon::start_data_table_row()
                        .'<td>'.$file."</td>"
                        .&Apache::loncommon::end_data_table_row()
               );
  }   }
           $r->print(&Apache::loncommon::end_data_table()
                    .'<br />'
           );
     }      }
       $r->print('<div>'
                .&mt('Check as many files as you wish in response to the problem:')
                .'</div>'
       );
 }  }
   
   
Line 1801  sub check_for_upload { Line 1855  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 1873  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 1889  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 2149  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 2284  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');
         }          }
Line 2336  sub handler { Line 2369  sub handler {
             &Apache::lonhtmlcommon::clear_breadcrumbs();              &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));              $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
         }          }
         my @dir_list=&get_dir_list($portfolio_root,undef,$group);          my @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
  if ($dir_list[0] eq 'no_such_dir'){   if ($dir_list[0] eq 'no_such_dir'){
     # two main reasons for this:      # two main reasons for this:
             #    1) never been here, so directory structure not created              #    1) never been here, so directory structure not created
Line 2352  sub handler { Line 2385  sub handler {
  $current_path = '/'; # force it back to the root           $current_path = '/'; # force it back to the root        
     }      }
     # now grab the directory list again, for the first time      # now grab the directory list again, for the first time
     @dir_list=              @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
                 &Apache::lonnet::dirlist($portfolio_root.$current_path,  
                                          $udom,$uname,$getpropath);  
         }          }
  # 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);
Removed from v.1.191  
changed lines
  Added in v.1.199

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