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

Diff for /loncom/interface/portfolio.pm between versions 1.184.2.1 and 1.205

version 1.184.2.1, 2007/07/10 20:57:10 version 1.205, 2009/01/03 19:28:53
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');
   
  # 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', '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>$lt{'parse'}
            <input type="checkbox" name="parserflag" checked="checked" />
            </label>
           </span>
   END
           }
   
           $r->print('<div>');
           # Upload File
           $r->print('<div class="LC_left_float">'
                    .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
                    .'<fieldset>'
                    .'<legend>'.$lt{'upload_label'}.'</legend>'
                    .$groupitem 
                    .'<input name="uploaddoc" type="file" />'
                    .'<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="storeupl" value="'.$lt{'upload'}.'" />'
                    .$help_fileupload
                    .$parse_check
                    .'</fieldset>'
                    .'</form>'
                    .'</div>'
           );
           # Create Subdirectory
           $r->print('<div class="LC_left_float">'
                    .'<form method="post" action="'.$escuri.'">'
                    .'<fieldset>'
                    .'<legend>'.$lt{'createdir_label'}.'</legend>'
                    .'<input name="newdir" type="text" />'.$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"
   
         $r->print(<<"TABLE");   
 <table id="LC_portfolio_actions">  
   <tr id="LC_portfolio_upload">  
     <td class="LC_label">  
       $text{'upload_label'}  
     </td>  
     <td class="LC_value">  
       <form method="post" enctype="multipart/form-data" action="$escuri">  
         $groupitem   
         <input name="uploaddoc" type="file" />  
  <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="storeupl" value="$text{'upload'}" />$help_fileupload  
       </form>  
     </td>  
   </tr>  
   <tr id="LC_portfolio_createdir">  
     <td class="LC_label">  
       $text{'createdir_label'}  
     </td>  
     <td class="LC_value">  
       <form method="post" action="$escuri">  
         <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="$text{'createdir'}" />$help_createdir  
       </form>  
     </td>  
   </tr>  
 </table>  
 TABLE  
     }  
     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
         $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');          $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
         $r->print('<td>'.$version_flag.'</td>');          $r->print('<td>'.$version_flag.'</td>');
     } else { # this is a graded or handed back file      } else { # this is a graded or handed back file
         my ($user,$domain) = &get_name_dom();          my ($user,$domain) = &get_name_dom($env{'form.group'});
         my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);          my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
         if (defined($$permissions_hash{$fullpath})) {          if (defined($$permissions_hash{$fullpath})) {
             foreach my $array_item (@{$$permissions_hash{$fullpath}}) {              foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
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 231  sub display_directory { Line 250  sub display_directory {
     my $select_mode;      my $select_mode;
     my $checked_files;      my $checked_files;
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my $access_admin_text = &mt('View Status');      my $access_admin_text = &mt('View Status');
     if ($can_setacl) {      if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');          $access_admin_text = &mt('View/Change Status');
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',
       '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><th colspan="2">Actions'.                   .&Apache::loncommon::start_data_table_header_row()
   &Apache::loncommon::help_open_topic('Portfolio FileAction').                   .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
   '</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.                   .'<th>&nbsp;</th><th>&nbsp;</th>'
   &Apache::loncommon::help_open_topic('Portfolio OpenFile').                   .'<th>'.&mt('Name').&Apache::loncommon::help_open_topic('Portfolio OpenFile').'</th>'
   '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.                   .'<th>'.&mt('Size').'</th>'
   &Apache::loncommon::help_open_topic('Portfolio ShareFile').                   .'<th>'.&mt('Last Modified').'</th>'
   '</th></tr>');                   .'<th>&nbsp;</th>'
                    .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
                    .&Apache::loncommon::end_data_table_header_row());
     }      }
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
Line 289  sub display_directory { Line 320  sub display_directory {
   my ($bfile)=split('&',$b,2);    my ($bfile)=split('&',$b,2);
   return (lc($afile) cmp lc($bfile));    return (lc($afile) cmp lc($bfile));
       } (@$dir_list)) {        } (@$dir_list)) {
     #$strip holds directory/file name  
     #$dom   
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     $filename =~ s/\s+$//;      $filename =~ s/\s+$//;
     my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);      my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
Line 335  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>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 348  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 356  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 364  sub display_directory { Line 400  sub display_directory {
                         my %anchor_fields = (                          my %anchor_fields = (
                             'lockinfo' => $fullpath                              'lockinfo' => $fullpath
                         );                          );
                         $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';                          $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,&mt('Locked')).'</td>';
  $css_class= 'LC_browser_file_locked';   $css_class= 'LC_browser_file_locked';
                     } else {                      } else {
                         if (!$can_modify) {                          if (!$can_modify) {
Line 382  sub display_directory { Line 418  sub display_directory {
                                 'rename' => $filename,                                  'rename' => $filename,
                                 currentpath => $current_path                                  currentpath => $current_path
                             );                              );
                             $line .= &make_anchor($url,\%anchor_fields,'Rename');                              $line .= &make_anchor($url,\%anchor_fields,&mt('Rename'));
                             $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);                              $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                             # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
Line 439  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="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 532  sub done { Line 572  sub done {
 }  }
   
 sub delete {  sub delete {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my @check;      my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print("The file is locked and cannot be deleted.<br />");          $r->print(&mt('The file is locked and cannot be deleted.').'<br />');
         $r->print(&done('Back',$url));          $r->print(&done('Back',$url));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
             &open_form($r,$url);              &open_form($r,$url);
             $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');              $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
             &close_form($r,$url);              &close_form($r,$url);
         } else {          } else {
             $r->print("No file was checked to delete.<br />");              $r->print("No file was checked to delete.<br />");
Line 557  sub delete_confirmed { Line 597  sub delete_confirmed {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;      my $result;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);                                                                          $uname);
Line 566  sub delete_confirmed { Line 606  sub delete_confirmed {
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
     $r->print('<span class="LC_error">'.      $r->print('<span class="LC_error">'
                      &mt('An error occurred ([_1]) while trying to delete                         .&mt('An error occurred ([_1]) while trying to delete [_2].'
                          [_2].',$result,&display_file(undef, $delete_file)).                           ,$result,&display_file(undef, $delete_file))
                       '</span><br /><br />');                        .'</span><br /><br />');
         } else {          } else {
             $r->print(&mt('File: [_1] deleted.',              $r->print(&mt('File: [_1] deleted.',
                           &display_file(undef,$delete_file)));                            &display_file(undef,$delete_file)));
Line 611  sub delete_confirmed { Line 651  sub delete_confirmed {
 sub delete_dir {  sub delete_dir {
     my ($r,$url)=@_;      my ($r,$url)=@_;
     &open_form($r,$url);      &open_form($r,$url);
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');       $r->print('<p>'.&mt('Delete [_1]?',&display_file()).'</p>');
     &close_form($r,$url);      &close_form($r,$url);
 }   } 
   
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my $directory_name = $env{'form.currentpath'};      my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash      $directory_name =~ s|/$||; # remove any trailing slash
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my $namespace = &get_namespace();      my $namespace = &get_namespace();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.      my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
        $directory_name);         $directory_name);
                 
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<span class="LC_error"> An error occurred (dir) ('.$result.   $r->print('<span class="LC_error">'
   ') while trying to delete '.$directory_name.'</span><br />');                    .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
                          ,$result,$directory_name)
                     .'</span><br />');
     } else {      } else {
         # now remove from recent          # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');  
         &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);          &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;          my @dirs = split m!/!, $directory_name;
           
 #        $directory_name =~ m/^(\/*\/)(\/*.)$/;  
         $directory_name='/';          $directory_name='/';
         for (my $i=1; $i < (@dirs - 1); $i ++){          for (my $i=1; $i < (@dirs - 1); $i ++){
             $directory_name .= $dirs[$i].'/';              $directory_name .= $dirs[$i].'/';
Line 645  sub delete_dir_confirmed { Line 684  sub delete_dir_confirmed {
 }  }
   
 sub rename {  sub rename {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};      my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) 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(undef,$url));          $r->print(&done(undef,$url));
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print('<p>'.&mt('Rename').' '.&display_file().' to           $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()
                    <input name="filenewname" type="input" size="50" />?</p>');                    , '<input name="filenewname" type="text" size="50" />').'</p>');
         &close_form($r,$url);          &close_form($r,$url);
     }      }
 }  }
Line 663  sub rename { Line 702  sub rename {
 sub rename_confirmed {  sub rename_confirmed {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});      my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     if ($filenewname eq '') {      if ($filenewname eq '') {
  $r->print('<span class="LC_error">'.   $r->print('<span class="LC_error">'.
Line 681  sub rename_confirmed { Line 720  sub rename_confirmed {
         $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);          $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
     } else {            } else {      
  $r->print('<span class="LC_error">'.   $r->print('<span class="LC_error">'.
   &mt('An error occurred ([_1]) while trying to rename [_2]'    &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
       .' to [_3]',$result,&display_file(),                        ,$result,&display_file(),&display_file('',$filenewname))
       &display_file('',$filenewname)).'</span><br />');                    .'</span><br />');
         return;          return;
     }      }
     if ($filenewname ne $env{'form.filenewname'}) {      if ($filenewname ne $env{'form.filenewname'}) {
Line 747  sub access_for_renamed { Line 786  sub access_for_renamed {
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;      my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};      my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
Line 762  sub display_access { Line 801  sub display_access {
         $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');          $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
         $info .= '</li><li>'.&explain_conditionals();          $info .= '</li><li>'.&explain_conditionals();
         $info .= '</li></ul>'.          $info .= '</li></ul>'.
                   &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />";                    &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
         if ($group eq '') {          if ($group eq '') {
             $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");              $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
         } else {          } else {
             $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");              $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
         }          }
         $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />";          $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
         if ($group ne '') {          if ($group ne '') {
             $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';              $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
         }          }
Line 779  sub display_access { Line 818  sub display_access {
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
  $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));   $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
  $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
  $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
         &access_setting_table($r,$url,$file_name,$access_controls{$file_name},          &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
                               $action);                                $action);
         my $button_text = {          my $button_text = {
                         'continue' => &mt('Proceed'),                          'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),                          'cancel' => &mt('Return to directory'),
                       };                        };
         &close_form($r,$url,$button_text);          &close_form($r,$url,$button_text);
     } else {      } else {
Line 814  sub view_access_settings { Line 853  sub view_access_settings {
         $todisplay{$scope}{$key} = $$access_controls{$key};          $todisplay{$scope}{$key} = $$access_controls{$key};
     }      }
     if ($aclcount) {      if ($aclcount) {
         $r->print(&mt('<h4>Current access controls defined for this file:</h4>'));          $r->print('<h4>'.&mt('Current access controls defined for this file:').'</h4>');
         $r->print(&Apache::loncommon::start_data_table());          $r->print(&Apache::loncommon::start_data_table());
         $r->print(&Apache::loncommon::start_data_table_header_row());          $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').          $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
Line 825  sub view_access_settings { Line 864  sub view_access_settings {
         &build_access_summary($r,$count,$chg,%todisplay);          &build_access_summary($r,$count,$chg,%todisplay);
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
     } else {      } else {
         $r->print(&mt('No access control settings currently exist for this file.<br />' ));          $r->print(&mt('No access control settings currently exist for this file.').'<br />');
     }      }
     my %anchor_fields = (      my %anchor_fields = (
         'currentpath' => $env{'form.currentpath'}          'currentpath' => $env{'form.currentpath'}
     );      );
     $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));      $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
     return;      return;
 }  }
   
Line 961  sub update_access { Line 1000  sub update_access {
     $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',      $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");                $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);      my ($errors,$outcome,$deloutcome,$new_values,$translation);
     if ($totalprocessed) {      if ($totalprocessed) {
         ($outcome,$deloutcome,$new_values,$translation) =          ($outcome,$deloutcome,$new_values,$translation) =
Line 1035  sub update_access { Line 1074  sub update_access {
         &open_form($r,$url);          &open_form($r,$url);
         foreach my $newitem ('course','domains','users') {          foreach my $newitem ('course','domains','users') {
             if ($env{'form.new'.$newitem} > 0) {              if ($env{'form.new'.$newitem} > 0) {
                 $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');                  $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
                 $firstitem = $totalnew;                  $firstitem = $totalnew;
                 $lastitem = $totalnew + $env{'form.new'.$newitem};                  $lastitem = $totalnew + $env{'form.new'.$newitem};
                 $totalnew = $lastitem;                  $totalnew = $lastitem;
Line 1055  sub update_access { Line 1094  sub update_access {
         );          );
         $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));          $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
         delete $anchor_fields{'access'};          delete $anchor_fields{'access'};
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));          $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory')));
     }      }
     return;      return;
 }  }
Line 1203  sub access_setting_table { Line 1242  sub access_setting_table {
 sub standard_settings {  sub standard_settings {
     my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,      my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
       $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;        $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
     $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');      $r->print('<h3>'.&mt('Public access: [_1]',&mt($publictext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
Line 1219  sub standard_settings { Line 1258  sub standard_settings {
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
     $r->print('</td><td width="40">&nbsp;</td><td valign="top">');      $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
     $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');      $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',&mt($guesttext)).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
Line 1265  sub standard_settings { Line 1304  sub standard_settings {
             'action' => 'chgconditions',              'action' => 'chgconditions',
             'currentpath' => $env{'form.currentpath'},              'currentpath' => $env{'form.currentpath'},
         );          );
     $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');      $r->print('<h3>'.&mt('Conditional access: [_1]',&mt($conditionstext)).'</h3>');
     if ($numconditionals > 0) {      if ($numconditionals > 0) {
         my $count = 1;          my $count = 1;
         my $chg = 'none';          my $chg = 'none';
Line 1315  sub access_element { Line 1354  sub access_element {
     my $title = $type;      my $title = $type;
     $title =~ s/s$//;      $title =~ s/s$//;
     $title =~ s/^(\w)/uc($1)/e;      $title =~ s/^(\w)/uc($1)/e;
     $r->print('<h3>'.&mt('[_1]-based conditional access: ',$title));      $r->print('<h3>'.&mt('[_1]-based conditional access: ',&mt($title)));
     if ($$acl_count{$type}) {      if ($$acl_count{$type}) {
         $r->print($$acl_count{$type}.' ');          $r->print($$acl_count{$type}.' ');
         if ($$acl_count{$type} > 1) {          if ($$acl_count{$type} > 1) {
Line 1370  sub display_access_row { Line 1409  sub display_access_row {
         }          }
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
     } else {      } else {
         $r->print(&mt('No [_1]-based conditions defined.<br />',$type).          $r->print(&mt('No [_1]-based conditions defined.',&mt($type)).'<br />'
                   &additional_item($type));                    .&additional_item($type));
     }      }
     return;      return;
 }  }
Line 1461  sub course_row { Line 1500  sub course_row {
                 }                  }
                 $max_id ++;                  $max_id ++;
                 my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');                  my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
                 $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');                  $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
             }              }
             $r->print('</table>');              $r->print('</table>');
         }          }
Line 1530  sub users_row { Line 1569  sub users_row {
   
 sub additional_item {  sub additional_item {
     my ($type) = @_;      my ($type) = @_;
     my $output = &mt('Add new [_1] condition(s)?',$type).'&nbsp;'.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';      my $output = &mt('Add new [_1] condition(s)?',&mt($type)).'&nbsp;'.&mt('Number to add: ').'<input type="text" name="new'.$type.'" size="3" value="0" />';
     return $output;      return $output;
 }  }
   
 sub actionbox {  sub actionbox {
     my ($status,$num,$scope) = @_;      my ($status,$num,$scope) = @_;
     my $output = '<span style="white-space: nowrap"><label>';      my $output = '<span class="LC_nobreak"><label>';
     if ($status eq 'new') {      if ($status eq 'new') {
         my $checkstate;          my $checkstate;
         if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {          if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
Line 1547  sub actionbox { Line 1586  sub actionbox {
         &mt('Activate');          &mt('Activate');
     } else {      } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.          $output .= '<input type="checkbox" name="delete" value="'.$num.
                    '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.                     '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="update" value="'.                     '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');                     $num.'" />'.&mt('Update');
     }      }
Line 1566  sub dateboxes { Line 1605  sub dateboxes {
                             undef,undef,1);                              undef,undef,1);
     my $enddate = &Apache::lonhtmlcommon::date_setter('portform',      my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
                                'enddate_'.$num,$end,undef,undef,undef,1,undef,                                 'enddate_'.$num,$end,undef,undef,undef,1,undef,
                                 undef,undef,1). '&nbsp;&nbsp;<span style="white-space: nowrap"><label>'.                                  undef,undef,1). '&nbsp;&nbsp;<span class="LC_nobreak"><label>'.
                                 '<input type="checkbox" name="noend_'.                                  '<input type="checkbox" name="noend_'.
                                 $num.'" '.$noend.' />'.&mt('No end date').                                  $num.'" '.$noend.' />'.&mt('No end date').
                                 '</label></span>';                                  '</label></span>';
Line 1740  ENDSMP Line 1779  ENDSMP
         </script>          </script>
 ENDSMP  ENDSMP
     $r->print($javascript);      $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>      $r->print("<h1>".&mt('Select portfolio files')."</h1>");
                 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>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 1756  sub check_for_upload { Line 1808  sub check_for_upload {
     my ($path,$fname,$group,$element) = @_;      my ($path,$fname,$group,$element) = @_;
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)      my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
   
     my $portfolio_root = &get_portfolio_root();      my $portfolio_root = &get_portfolio_root();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     # Fixme --- Move the checking for existing file to LOND error return      # Fixme --- Move the checking for existing file to LOND error return
     my @dir_list=&get_dir_list($portfolio_root,$path);      my @dir_list=&get_dir_list($portfolio_root,$path,$group);
     my $found_file = 0;      my $found_file = 0;
     my $locked_file = 0;      my $locked_file = 0;
     foreach my $line (@dir_list) {      foreach my $line (@dir_list) {
Line 1775  sub check_for_upload { Line 1826  sub check_for_upload {
             }               } 
         }          }
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);      my $getpropath = 1;
       my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
   
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         my $msg = '<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.          my $msg = '<span class="LC_error">'.
     '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.';                  &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
                     '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
  return ('will_exceed_quota',$msg);   return ('will_exceed_quota',$msg);
     } elsif ($found_file) {      } elsif ($found_file) {
         if ($locked_file) {          if ($locked_file) {
             my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.              my $msg = '<span class="LC_error">';
  '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.';              $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
               $msg .= '</span><br />';
               $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
     return ('file_locked',$msg);      return ('file_locked',$msg);
  } else {   } else {
             my $msg = '<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$path.'</strong></span>'.              my $msg = '<span class="LC_error">';
  '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$path;              $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
               $msg .= '</span>';
               $msg .= '<br />';
               $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
     return ('file_exists',$msg);      return ('file_exists',$msg);
  }   }
     }      }
Line 1797  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 1808  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','',
  $port_path.$env{'form.currentpath'},   $port_path.$env{'form.currentpath'},
  $mode,\%allfiles,\%codebase);   $mode,\%allfiles,\%codebase);
     if ($result !~ m|^/uploaded/|) {      if ($result !~ m|^/uploaded/|) {
  $r->print('<span class="LC_error">'.'An error occurred ('.$result.   $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
   ') while trying to upload '.&display_file().'</span><br />');                    ,$result,&display_file()).'</span><br />');
  $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 listing',$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">'.'An error occurred ('.$result.  
       ') while trying to upload '.$orig_uploaded_filename.' for embedded element '.$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();      my ($uname,$udom) = &get_name_dom($group);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                        $uname);                                                                         $uname);
     my $file_name = $env{'form.lockinfo'};      my $file_name = $env{'form.lockinfo'};
Line 1924  sub lock_info { Line 1945  sub lock_info {
     my %course_description =       my %course_description = 
  &Apache::lonnet::coursedescription($$array_item[1]);   &Apache::lonnet::coursedescription($$array_item[1]);
     if ( $course_description{'description'} ne '') {      if ( $course_description{'description'} ne '') {
  $r->print(&mt('In the course: <strong>[_1]</strong><br />',   $r->print(&mt('In the course:').' <strong>'.$course_description{'description'}.'</strong><br />');
       $course_description{'description'}));  
     }      }
         }          }
     }      }
     $r->print(&done('Back',$url));      $r->print(&done(&mt('Back'),$url));
     return 'ok';      return 'ok';
 }  }
   
 sub createdir {  sub createdir {
     my ($r,$url)=@_;      my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});      my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {      if ($newdir eq '') {
     $r->print('<span class="LC_error">'.      $r->print('<span class="LC_error">'.
Line 1944  sub createdir { Line 1964  sub createdir {
     return;      return;
     }      }
     my $portfolio_root = &get_portfolio_root();       my $portfolio_root = &get_portfolio_root(); 
     my @dir_list=&get_dir_list($portfolio_root);      my @dir_list=&get_dir_list($portfolio_root,undef,$group);
     my $found_file = 0;      my $found_file = 0;
     foreach my $line (@dir_list) {      foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);          my ($filename)=split(/\&/,$line,2);
Line 1953  sub createdir { Line 1973  sub createdir {
         }          }
     }      }
     if ($found_file){      if ($found_file){
        $r->print('<span class="LC_error">'.'Unable to create a directory named <strong>'.$newdir.         $r->print('<span class="LC_error">'
                ' </strong>a file or directory by that name already exists.</span><br />');                        .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')
                         .' '.&mt('A file or directory by that name already exists.').'</span><br />');
     } else {      } else {
         my ($uname,$udom) = &get_name_dom();          my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path();          my $port_path = &get_port_path();
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,          my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
          $port_path.$env{'form.currentpath'}.$newdir);           $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<span class="LC_error">'.'An error occurred ('.$result.         $r->print('<span class="LC_error">'
           ') while trying to create a new directory '.&display_file().'</span><br />');                        .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'
                              ,$result,&display_file())
                         .'</span><br />');
         }          }
     }      }
     if ($newdir ne $env{'form.newdir'}) {      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(&mt('The new directory name was changed from [_1] to [_2].'
                         ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));  
     }      }
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
Line 1974  sub createdir { Line 1998  sub createdir {
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($udom,$uname,$group) = @_;      my ($udom,$uname,$group) = @_;
     if (!(defined($udom)) || !(defined($uname))) {      if (!(defined($udom)) || !(defined($uname))) {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom($group);
     }      }
     my $path = '/userfiles/portfolio';      my $path = '/userfiles/portfolio';
     if (!defined($group)) {       if (!defined($group)) { 
Line 1985  sub get_portfolio_root { Line 2009  sub get_portfolio_root {
     if (defined($group)) {      if (defined($group)) {
         $path = '/userfiles/groups/'.$group.'/portfolio';          $path = '/userfiles/groups/'.$group.'/portfolio';
     }       } 
     return (&Apache::loncommon::propath($udom,$uname).$path);      return $path;
 }  }
   
 sub get_group_quota {  sub get_group_quota {
Line 2000  sub get_group_quota { Line 2024  sub get_group_quota {
         $group_quota = $group_info{'quota'}; #expressed in Mb          $group_quota = $group_info{'quota'}; #expressed in Mb
         if ($group_quota) {          if ($group_quota) {
             $group_quota = 1000 * $group_quota; #expressed in k              $group_quota = 1000 * $group_quota; #expressed in k
         }           }
     }      }
     return $group_quota;      return $group_quota;
 }   }
   
 sub get_dir_list {  sub get_dir_list {
     my ($portfolio_root,$path) = @_;      my ($portfolio_root,$path,$group) = @_;
     $path ||= $env{'form.currentpath'};      $path ||= $env{'form.currentpath'};
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom($group);
     return &Apache::lonnet::dirlist($path,$udom,$uname,$portfolio_root);      my $getpropath = 1;
       return &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
 }  }
   
 sub get_name_dom {  sub get_name_dom {
       my ($group) = @_;
     my ($uname,$udom);      my ($uname,$udom);
     if (defined($env{'form.group'})) {      if (defined($group)) {
         $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};          $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $uname = $env{'course.'.$env{'request.course.id'}.'.num'};          $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
     } else {      } else {
Line 2035  sub prepend_group { Line 2061  sub prepend_group {
 sub get_namespace {  sub get_namespace {
     my $namespace = 'portfolio';      my $namespace = 'portfolio';
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
         my ($uname,$udom) = &get_name_dom();          my ($uname,$udom) = &get_name_dom($env{'form.group'});
         $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};          $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
     }      }
     return $namespace;      return $namespace;
Line 2067  sub missing_priv { Line 2093  sub missing_priv {
         $rtnlink .= '?';          $rtnlink .= '?';
     }      }
     $rtnlink .= 'currentpath='.$escpath;      $rtnlink .= 'currentpath='.$escpath;
     $r->print(&mt('<h3>Action disallowed</h3>'));      $r->print('<h3>'.&mt('Action disallowed').'</h3>');
     $r->print(&mt('You do not have sufficient privileges to [_1] ',      $r->print(&mt('You do not have sufficient privileges to [_1] ',
                   $longtext->{$priv}));                    $longtext->{$priv}));
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
Line 2076  sub missing_priv { Line 2102  sub missing_priv {
     } else {      } else {
         $r->print(&mt('in this portfolio.'));          $r->print(&mt('in this portfolio.'));
     }      }
     $rtnlink .= '">'.&mt('Return to directory listing page').'</a>';      $rtnlink .= '">'.&mt('Return to directory').'</a>';
     $r->print('<br />'.$rtnlink);      $r->print('<br />'.$rtnlink);
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
     return;      return;
Line 2123  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 2149  sub handler { Line 2186  sub handler {
            &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));             &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
         $env{'form.group'} =~ s/\W//g;          $env{'form.group'} =~ s/\W//g;
  $group = $env{'form.group'};   $group = $env{'form.group'};
         if ($group) {          if ($group ne '') {
             ($uname,$udom) = &get_name_dom();              ($uname,$udom) = &get_name_dom($group);
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,              my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
        $group);          $group); 
             if (%curr_groups) {              if (%curr_groups) {
Line 2161  sub handler { Line 2198  sub handler {
                                       $env{'request.course.id'}.'/'.$group))) {                                        $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root();                      $portfolio_root = &get_portfolio_root();
                 } else {                  } else {
                     $r->print('You do not have the privileges required to access the shared files space for this group.');                      $r->print(&mt('You do not have the privileges required to access the shared files space for this group.'));
                     $earlyout = 1;                      $earlyout = 1;
                 }                  }
             } else {              } else {
                 $r->print('Not a valid group for this course');                  $r->print(&mt('Not a valid group for this course'));
                 $earlyout = 1;                  $earlyout = 1;
             }              }
             $title = &mt('Group files').' for '.$group;               $title = &mt('Group files for [_1]', $group); 
         } else {          } else {
             $r->print('Invalid group');              $r->print(&mt('Invalid group'));
             $earlyout = 1;              $earlyout = 1;
         }          }
         if ($earlyout) { return OK; }          if ($earlyout) { return OK; }
Line 2208  sub handler { Line 2245  sub handler {
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     # Give the LON-CAPA page header      # Give the LON-CAPA page header
       my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
   
     if ($env{"form.mode"} eq 'selectfile'){      if ($env{"form.mode"} eq 'selectfile'){
         $r->print(&Apache::loncommon::start_page($title,undef,          $r->print(&Apache::loncommon::start_page($title,undef,
  {'only_body' => 1}));   {'only_body' => 1}));
     } elsif ($env{'form.action'} eq 'rolepicker') {      } elsif ($env{'form.action'} eq 'rolepicker') {
         $r->print(&Apache::loncommon::start_page('New role-based condition',undef,          $r->print(&Apache::loncommon::start_page('New role-based condition',undef,
                                                  {'no_nav_bar'  => 1, }));                                                   {'no_nav_bar'  => 1, }));
     } else {      } elsif ($caller eq 'coursegrp_portfolio') {
         $r->print(&Apache::loncommon::start_page($title));          $r->print(&Apache::loncommon::start_page($title));
       } else {
           $r->print(&Apache::loncommon::start_page($title,undef,
                                                    {'bread_crumbs' => $brcrum}));
           if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
               $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
                         &mt('This is a result of one of the following:').'<ul>'.
                         '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
                         '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
                         '</ul>');
               $r->print(&Apache::loncommon::end_page());
               return OK;
           }
     }      }
     $r->rflush();      $r->rflush();
     my ($blocked,$blocktext) =       my ($blocked,$blocktext) = 
Line 2226  sub handler { Line 2277  sub handler {
          return OK;           return OK;
     }      }
  if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){   if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
        $r->print('<span class="LC_error">'.         $r->print('<span class="LC_error">');
       'No file was selected to upload.'.         $r->print(&mt('No file was selected to upload.').' ');
       'To upload a file, click <strong>Browse...</strong>'.      $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
       ', select a file, then click <strong>Upload</strong>.'.      $r->print('</span>');
       '</span>');  
  }   }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r,$url);          &open_form($r,$url);
 #        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));          $r->print(&mt('Edit the meta data').'<br />');
         $r->print('Edit the meta data<br />');  
         &close_form($r,$url);          &close_form($r,$url);
     }      }
     if ($env{'form.store'}) {      if ($env{'form.store'}) {
Line 2249  sub handler { Line 2298  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 2261  sub handler { Line 2317  sub handler {
         }          }
     } elsif ($env{'form.action'} eq 'delete') {      } elsif ($env{'form.action'} eq 'delete') {
         if ($can_delete) {          if ($can_delete) {
     &delete($r,$url);      &delete($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'delete');              &missing_priv($r,$url,'delete');
         }          }
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
         if ($can_delete) {          if ($can_delete) {
     &delete_dir_confirmed($r,$url);      &delete_dir_confirmed($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'delete');              &missing_priv($r,$url,'delete');
         }          }
Line 2287  sub handler { Line 2343  sub handler {
         $env{'form.selectfile'} = $env{'form.rename'};          $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';          $env{'form.action'} = 'rename';
         if ($can_modify) {          if ($can_modify) {
     &rename($r,$url);      &rename($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'rename');              &missing_priv($r,$url,'rename');
         }          }
Line 2312  sub handler { Line 2368  sub handler {
         }          }
     } elsif ($env{'form.createdir'}) {      } elsif ($env{'form.createdir'}) {
         if ($can_upload) {          if ($can_upload) {
     &createdir($r,$url);      &createdir($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'upload');              &missing_priv($r,$url,'upload');
         }          }
Line 2327  sub handler { Line 2383  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);          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 2343  sub handler { Line 2399  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=&Apache::lonnet::dirlist($current_path,              @dir_list=&get_dir_list($portfolio_root,$current_path,$group);
     $udom,$uname,$portfolio_root);  
         }          }
  # 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.184.2.1  
changed lines
  Added in v.1.205

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