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

version 1.191, 2008/04/16 23:11:06 version 1.225, 2010/10/23 19:28:12
Line 38  use Apache::lonnet; Line 38  use Apache::lonnet;
 use Apache::longroup;  use Apache::longroup;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
 use HTML::Entities;  use HTML::Entities;
 use LONCAPA;  use LONCAPA qw(:DEFAULT :match);
   
 sub group_args {  sub group_args {
     my $output;      my $output;
Line 80  sub make_anchor { Line 80  sub make_anchor {
   
 my $dirptr=16384;  my $dirptr=16384;
 sub display_common {  sub display_common {
     my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;      my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_;
     my $namespace = &get_namespace();      my $namespace = &get_namespace();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     if ($can_upload) {      if ($can_upload) {
         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' => 'Create subdirectory in current directory',
  'createdir_label' =>                      'parse'           => 'Upload embedded images/multimedia/css/linked files if HTML file',
  'Create subdirectory in current directory:');                 );
         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');
           my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
  # FIXME: This line should be deleted once Portfolio uses breadcrumbs          $r->print(&display_usage($group));
  $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>
             <input type="checkbox" name="parserflag" checked="checked" />
             $lt{'parse'}
            </label>
           </span>
   END
           }
   
           $r->print('<div>'.$help_portfolio);
           # 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 145  TABLE Line 158  TABLE
         'fieldname'     => $env{"form.fieldname"},          'fieldname'     => $env{"form.fieldname"},
         'continue'      => $env{"form.continue"}          'continue'      => $env{"form.continue"}
     );      );
       $r->print('<br clear="all" />');
     $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');      $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '/';          my $newCurrentPath = '/';
Line 170  TABLE Line 184  TABLE
     $r->print("</form>");      $r->print("</form>");
 }  }
   
   sub display_usage {
       my ($group) = @_;
       my $disk_quota = &get_quota($group);
       my $getpropath = 1;
       my $portfolio_root = &get_portfolio_root();
       my ($uname,$udom) = &get_name_dom($group);
       my $current_disk_usage =
            &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       my $usage = $current_disk_usage/1000;
       my $quota = $disk_quota/1000;
       my $percent;
       if ($disk_quota == 0) {
           $percent = 100.0;
       } else {
           $percent = 100*($current_disk_usage/$disk_quota);
       }
       $usage = sprintf("%.2f",$usage);
       $quota = sprintf("%.2f",$quota);
       $percent = sprintf("%.0f",$percent);
       my ($color,$cssclass);
       if ($percent <= 60) {
           $color = '#00A000';
       } elsif ($percent > 60 && $percent < 90) {
           $color = '#FFD300';
           $cssclass = 'class="LC_warning"';
       } elsif( $percent >= 90) {
           $color = '#FF0000';
           $cssclass = 'class="LC_error"';
       }
       my $prog_width = $percent;
       if ($prog_width > 100) {
           $prog_width = 100;
       }
       my $disk_meter = '
     <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
   '   <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
   '    <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
   '   </div>'."\n".
   '  </div>';
       return &Apache::loncommon::head_subbox($disk_meter);
   }
   
 sub display_directory_line {  sub display_directory_line {
     my ($r,$select_mode, $filename, $mtime, $size, $css_class,      my ($r,$select_mode, $filename, $mtime, $size, $css_class,
  $line, $access_controls, $curr_access, $now, $version_flag,   $line, $access_controls, $curr_access, $now, $version_flag,
  $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).'" class="LC_fileicon" /></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($env{'form.group'});          my ($user,$domain) = &get_name_dom($env{'form.group'});
Line 212  sub display_directory_line { Line 268  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 {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,      my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;          $can_modify,$can_delete,$can_setacl)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $display_out;  
     my $select_mode;      my $select_mode;
     my $checked_files;      my $checked_files;
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
Line 244  sub display_directory { Line 303  sub display_directory {
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;      my $now = time;
     if ($env{"form.mode"} eq 'selectfile') {      if ($env{"form.mode"} eq 'selectfile') {
  &select_files($r);          &select_files($r);
  $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});          $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
  $select_mode = 'true';          $select_mode = 'true';
     }   
     if ($is_empty && ($current_path ne '/') && $can_delete) {  
         $display_out = '<form method="post" action="'.$url.'">'.  
     &group_form_data().  
         '<input type="hidden" name="action" value="deletedir" />'.  
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.  
         '<input type="hidden" name="selectfile" value="" />'.  
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.  
         '</form>';  
           
         $r->print($display_out);  
  return;  
     }      }
     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(
       &mt('Using the portfolio file list')));              '<p>'
         $r->print('<table id="LC_browser">'.             .&Apache::loncommon::help_open_topic(
                   '<tr>'                  'Portfolio FileList',
                   &mt('Using the portfolio file list'))
              .'</p>'
           );
           $r->print(&Apache::loncommon::start_data_table()
                    .&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());
       }
   
       # Empty directory?
       if ($is_empty && ($current_path ne '/') && $can_delete) {
           my $cols = ($select_mode eq 'true') ? 7 : 9;
           # Empty message
           $r->print(
               &Apache::loncommon::start_data_table_row()
              .'<td colspan="'.$cols.'">'
              .'<p class="LC_info">'
              .&mt('This directory is empty.')
              .'</p>'
              .'</td>'
              .&Apache::loncommon::end_data_table_row()
              .&Apache::loncommon::end_data_table()
              .'</form>'
           );
           # Delete button
           $r->print(
               '<form method="post" action="'.$url.'">'.
               &group_form_data().
               '<input type="hidden" name="action" value="deletedir" />'.
               '<p>'.
               '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
               '</p>'.
               '<input type="hidden" name="selectfile" value="" />'.
               '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
               '</form>'
           );
           # Directory is empty, so nothing else to display
           return;
     }      }
   
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;      my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
Line 334  sub display_directory { Line 429  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.'navmap.folder.closed.gif" class="LC_fileicon" /></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 447  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 457  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 375  sub display_directory { Line 477  sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';                              $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }                          }
                         if ($can_modify) {                          if ($can_modify) {
                             my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').                              my $cat='<img class="LC_icon" alt="'.&mt('Metadata').'" title="'.&mt('Metadata').'" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.png').'" />';
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';  
                             my %anchor_fields = (                              my %anchor_fields = (
                                 'rename' => $filename,                                  'rename' => $filename,
                                 currentpath => $current_path                                  currentpath => $current_path
Line 438  sub display_directory { Line 539  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 653  sub rename { Line 758  sub rename {
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()          $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 760  sub display_access { Line 865  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 799  sub display_access { Line 904  sub display_access {
 sub explain_conditionals {  sub explain_conditionals {
     return      return
         &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".          &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'."\n".
         &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'<br />'."\n".          &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'<br />'."\n".
         &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');          &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
 }  }
   
Line 840  sub build_access_summary { Line 945  sub build_access_summary {
                       guest => 'Passphrase-protected',                        guest => 'Passphrase-protected',
                       domains => 'Conditional: domain-based',                        domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',                        users => 'Conditional: user-based',
                       course => 'Conditional: course-based',                        course => 'Conditional: course/community-based',
                      );                       );
     my @allscopes = ('public','guest','domains','users','course');      my @allscopes = ('public','guest','domains','users','course');
     foreach my $scope (@allscopes) {      foreach my $scope (@allscopes) {
Line 865  sub build_access_summary { Line 970  sub build_access_summary {
                 }                  }
             }              }
             $r->print('<td>'.&mt($scope_desc{$scope}));              $r->print('<td>'.&mt($scope_desc{$scope}));
               my $crstype;
             if ($scope eq 'course') {              if ($scope eq 'course') {
                 if ($chg ne 'delete') {                  if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};                      my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);                      my %course_description = &Apache::lonnet::coursedescription($cid);
                     $r->print('<br />('.$course_description{'description'}.')');                      $r->print('<br />('.$course_description{'description'}.')');
                       $crstype = 'Course';
                       if ($course_description{'type'} ne '') {
                           $crstype = $course_description{'type'};
                       }
                 }                  }
             }              }
             $r->print('</td><td>'.&mt('Start: ').$showstart.              $r->print('</td><td>'.&mt('Start: ').$showstart.
Line 889  sub build_access_summary { Line 999  sub build_access_summary {
                         foreach my $item ('role','access','section','group') {                          foreach my $item ('role','access','section','group') {
                             $r->print('<td>');                              $r->print('<td>');
                             if ($item eq 'role') {                              if ($item eq 'role') {
                                 my $ucscope = $scope;  
                                 $ucscope =~ s/^(\w)/uc($1)/e;  
                                 my $role_output;                                  my $role_output;
                                 foreach my $role (@{$content->{'roles'}{$id}{$item}}) {                                  foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
                                     if ($role eq 'all') {                                      if ($role eq 'all') {
Line 898  sub build_access_summary { Line 1006  sub build_access_summary {
                                     } elsif ($role =~ /^cr/) {                                      } elsif ($role =~ /^cr/) {
                                         $role_output .= (split('/',$role))[3].',';                                          $role_output .= (split('/',$role))[3].',';
                                     } else {                                      } else {
                                         $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';                                          $role_output .= &Apache::lonnet::plaintext($role,$crstype).',';
                                     }                                      }
                                 }                                  }
                                 $role_output =~ s/,$//;                                  $role_output =~ s/,$//;
Line 1024  sub update_access { Line 1132  sub update_access {
     my $totalnew = 0;      my $totalnew = 0;
     my $status = 'new';      my $status = 'new';
     my ($firstitem,$lastitem);      my ($firstitem,$lastitem);
     foreach my $newitem ('course','domains','users') {      my @types = ('course','domains','users');
       foreach my $newitem (@types) {
         $allnew += $env{'form.new'.$newitem};          $allnew += $env{'form.new'.$newitem};
     }      }
     if ($allnew > 0) {      if ($allnew > 0) {
         my $now = time;          my $now = time;
         my $then = $now + (60*60*24*180); # six months approx.          my $then = $now + (60*60*24*180); # six months approx.
         &open_form($r,$url);          &open_form($r,$url);
         foreach my $newitem ('course','domains','users') {          my %showtypes = &Apache::lonlocal::texthash (
              course  => 'course/community',
              domains => 'domain',
              users   => 'user',
           );
           foreach my $newitem (@types) {
             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>',&mt($newitem),$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');                  $r->print('<br />'.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]','<b>'.$showtypes{$newitem},'</b>','<b>'.$env{'form.currentpath'}.$env{'form.selectfile'}.'</b>').'<br /><br />');
                 $firstitem = $totalnew;                  $firstitem = $totalnew;
                 $lastitem = $totalnew + $env{'form.new'.$newitem};                  $lastitem = $totalnew + $env{'form.new'.$newitem};
                 $totalnew = $lastitem;                  $totalnew = $lastitem;
Line 1276  sub standard_settings { Line 1390  sub standard_settings {
         &build_access_summary($r,$count,$chg,%conditionals);          &build_access_summary($r,$count,$chg,%conditionals);
         $r->print(&Apache::loncommon::end_data_table());          $r->print(&Apache::loncommon::end_data_table());
     } else {      } else {
         $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));          $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course/community affiliation.'));
     }      }
 }  }
   
Line 1310  sub acl_status { Line 1424  sub acl_status {
   
 sub access_element {  sub access_element {
     my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;      my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
     my $title = $type;      my %typetext = &Apache::lonlocal::texthash(
     $title =~ s/s$//;          domains => 'Domain',
     $title =~ s/^(\w)/uc($1)/e;          users   => 'User',
     $r->print('<h3>'.&mt('[_1]-based conditional access: ',&mt($title)));          course  => 'Course/Community'
       );
       $r->print('<h3>'.&mt('[_1]-based conditional access: ',$typetext{$type}));
     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 1331  sub access_element { Line 1447  sub access_element {
   
 sub display_access_row {  sub display_access_row {
     my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;      my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
       my $showtype;
       if ($type eq 'course') {
           $showtype = &mt('Courses/Communities');
       } elsif ($type eq 'domains') {
           $showtype = &mt('Domains');
       } elsif ($type eq 'users') {
           $showtype = &mt('Users');
       }
     if (@{$items} > 0) {      if (@{$items} > 0) {
         my @all_doms;          my @all_doms;
         my $colspan = 3;          my $colspan = 3;
         my $uctype = $type;  
         $uctype =~ s/^(\w)/uc($1)/e;  
         $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($uctype).'</th><th>'.          $r->print('<th>'.&mt('Action?').'</th><th>'.$showtype.'</th><th>'.
               &mt('Dates available').'</th>');                &mt('Dates available').'</th>');
         if ($type eq 'course' && $status eq 'old') {          if ($type eq 'course' && $status eq 'old') {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).              
               $r->print('<th>'.&mt('Allowed course/community affiliations').
                       '</th>');                        '</th>');
             $colspan ++;              $colspan ++;
         } elsif ($type eq 'domains') {          } elsif ($type eq 'domains') {
Line 1368  sub display_access_row { Line 1491  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.',&mt($type)).'<br />'          $r->print(&mt('No [_1]-based conditions defined.',$showtype).'<br />'.
                   .&additional_item($type));                    &additional_item($type));
     }      }
     return;      return;
 }  }
Line 1430  sub course_row { Line 1553  sub course_row {
     }      }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)      my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
  .&course_js();   .&course_js();
     my $uctype = $type;      my $showtype = &mt('Course/Community');
     $uctype =~ s/^(\w)/uc($1)/e;      my $crstype = 'Course';
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     $type);                                                      $type);
     $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');      $r->print('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
     if ($status eq 'old') {      if ($status eq 'old') {
         my $cid = $content->{'domain'}.'_'.$content->{'number'};          my $cid = $content->{'domain'}.'_'.$content->{'number'};
         my %course_description = &Apache::lonnet::coursedescription($cid);          my %course_description = &Apache::lonnet::coursedescription($cid);
           if ($course_description{'type'} ne '') {
               $crstype = $course_description{'type'};
           }
         $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');          $r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
     } elsif ($status eq 'new') {      } elsif ($status eq 'new') {
         $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$uctype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');          $r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,$num.'_1',undef,$showtype).'&nbsp;&nbsp;<input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
     }      }
     $r->print('<td>'.&dateboxes($num,$start,$end));      $r->print('<td>'.&dateboxes($num,$start,$end));
     my $newrole_id = 1;      my $newrole_id = 1;
Line 1458  sub course_row { Line 1584  sub course_row {
                     $max_id = $role_id;                      $max_id = $role_id;
                 }                  }
                 $max_id ++;                  $max_id ++;
                 my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');                  my $role_selects = &role_selectors($num,$role_id,$crstype,$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>');
         }          }
         $r->print('<br />'.&mt('Add a roles-based condition').          $r->print('<br />'.&mt('Add a roles-based condition').
                   '&nbsp;<input type="checkbox" name ="add_role_'.                    '&nbsp;<input type="checkbox" name="add_role_'.
                   $num.'" onClick="javascript:setRoleOptions('."'$num',                    $num.'" onClick="javascript:setRoleOptions('."'$num',
                   '$max_id','$content->{'domain'}','$content->{'number'}',                    '$max_id','$content->{'domain'}','$content->{'number'}',
                   '$uctype'".')" value="" />');                    '$showtype'".')" value="" />');
         $newrole_id = $max_id;          $newrole_id = $max_id;
     } else {      } else {
         $r->print('<input type="hidden" name ="add_role_'.$num.'" value="" />');          $r->print('<input type="hidden" name="add_role_'.$num.'" value="" />');
     }      }
     $r->print(&add_course_role($num,$newrole_id));      $r->print(&add_course_role($num,$newrole_id));
     $r->print('</td>');      $r->print('</td>');
Line 1491  sub domains_row { Line 1617  sub domains_row {
     my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;      my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                     'domains');                                                      'domains');
     my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="true">'.      my $dom_select = '<select name="dom_'.$num.'" size="4" multiple="multiple">'.
                      ' <option value="">'.&mt('Please select').'</option>';                       ' <option value="">'.&mt('Please select').'</option>';
     if ($status eq 'old') {      if ($status eq 'old') {
         my $content =  $$access_controls{$item};          my $content =  $$access_controls{$item};
  foreach my $dom (@{$all_doms}) {   foreach my $dom (@{$all_doms}) {
             if ((@{$content->{'dom'}} > 0)               if ((@{$content->{'dom'}} > 0) 
  && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {   && (grep(/^\Q$dom\E$/,@{$content->{'dom'}}))) {
                 $dom_select .= '<option value="'.$dom.'" selected>'.                  $dom_select .= '<option value="'.$dom.'" selected="selected">'.
                                $dom.'</option>';                                 $dom.'</option>';
             } else {              } else {
                 $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';                  $dom_select .= '<option value="'.$dom.'">'.$dom.'</option>';
Line 1528  sub users_row { Line 1654  sub users_row {
   
 sub additional_item {  sub additional_item {
     my ($type) = @_;      my ($type) = @_;
     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" />';      my $showtype;
       if ($type eq 'course') {
           $showtype = &mt('course/community');
       } elsif ($type eq 'domains') {
           $showtype = &mt('domains');
       } elsif ($type eq 'users') {
           $showtype = &mt('users');
       }
       my $output = &mt('Add new [_1] condition(s)?',$showtype).'&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 1545  sub actionbox { Line 1679  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 1564  sub dateboxes { Line 1698  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 1599  sub role_selectors { Line 1733  sub role_selectors {
          $cdom = $env{'form.cdom'};           $cdom = $env{'form.cdom'};
          $cnum = $env{'form.cnum'};           $cnum = $env{'form.cnum'};
     }      }
     my $uctype = $type;      my $crstype = 'Course';
     $uctype =~ s/^(\w)/uc($1)/e;      if ($cnum =~ /^$match_community$/) {
           $crstype = 'Community'
       }
     my ($sections,$groups,$allroles,$rolehash,$accesshash) =      my ($sections,$groups,$allroles,$rolehash,$accesshash) =
             &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype);              &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$crstype);
     if (!@{$sections}) {      if (!@{$sections}) {
         @{$sections} = ('none');          @{$sections} = ('none');
     } else {      } else {
Line 1635  sub role_selectors { Line 1771  sub role_selectors {
                     'group' => $groups,                      'group' => $groups,
                    );                     );
     foreach my $item ('role','access','section','group') {      foreach my $item ('role','access','section','group') {
         $output .= '<td><select name="'.$item.$longid.'" multiple="true" size="4">'."\n";          $output .= '<td><select name="'.$item.$longid.'" multiple="multiple" size="4">'."\n";
         foreach my $entry (@{$allitems{$item}}) {          foreach my $entry (@{$allitems{$item}}) {
             if ($caller eq 'display') {              if ($caller eq 'display') {
                 if ((@{$$content{'roles'}{$role_id}{$item}} > 0) &&                   if ((@{$$content{'roles'}{$role_id}{$item}} > 0) && 
                     (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {                      (grep(/^\Q$entry\E$/,@{$$content{'roles'}{$role_id}{$item}}))) {
                     $output .= '  <option value="'.$entry.'" selected>'.                      $output .= '  <option value="'.$entry.'" selected="selected">'.
                                   $lookup{$item}{$entry}.'</option>';                                    $lookup{$item}{$entry}.'</option>';
                     next;                      next;
                 }                  }
Line 1697  function getIndexByName(item) { Line 1833  function getIndexByName(item) {
   
 </script>  </script>
 END_SCRIPT  END_SCRIPT
     $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));      $r->print(
     $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');          '<p>'
          .&mt('Select roles, '.lc($type).' status, section(s) and group(s) for users'
              .' who will be able to access the portfolio file.')
          .'</p>'
       );
       $r->print(
           '<form name="rolepicker" action="/adm/portfolio" method="post">'
          .'<table><tr>'
          .'<th>'.&mt('Roles').'</th>'
          .'<th>'.&mt("$type status").'</th>'
          .'<th>'.&mt('Sections').'</th>'
          .'<th>'.&mt('Groups').'</th>'
          .'</tr><tr>'.$role_selects.'</tr>'
          .'</table><br />'
          .'<input type="button" name="rolepickbutton" value="'.&mt('Save').'" onclick="setRoles()" />'
       );
     return;      return;
 }  }
   
Line 1738  ENDSMP Line 1889  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>'
       );
 }  }
   
   sub upload {
 sub check_for_upload {      my ($r,$url,$group)=@_;
     my ($path,$fname,$group,$element) = @_;      my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     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($group);      my ($uname,$udom) = &get_name_dom($group);
     # Fixme --- Move the checking for existing file to LOND error return  
     my @dir_list=&get_dir_list($portfolio_root,$path,$group);  
     my $found_file = 0;  
     my $locked_file = 0;  
     foreach my $line (@dir_list) {  
         my ($file_name)=split(/\&/,$line,2);  
         if ($file_name eq $fname){  
             $file_name = $path.$file_name;  
             $file_name = &prepend_group($file_name);  
             $found_file = 1;  
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {  
                 $locked_file = 1;  
             }   
         }  
     }  
     my $getpropath = 1;      my $getpropath = 1;
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);      my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       my ($state,$msg) = 
     if (($current_disk_usage + $filesize) > $disk_quota){          &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
         my $msg = '<span class="LC_error">'.                               $group,'uploaddoc',$portfolio_root,
                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.                                               $port_path,$disk_quota,
                   '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);                                               $current_disk_usage,$uname,$udom);
  return ('will_exceed_quota',$msg);  
     } elsif ($found_file) {  
         if ($locked_file) {  
             my $msg = '<span class="LC_error">';  
             $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);  
  } else {  
             my $msg = '<span class="LC_error">';  
             $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);  
  }  
     }  
 }  
   
 sub upload {  
     my ($r,$url,$group)=@_;  
     my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});  
   
     my ($state,$msg) = &check_for_upload($env{'form.currentpath'},  
  $fname,$group,'uploaddoc');  
   
     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 1934  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 1950  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 2082  sub missing_priv { Line 2158  sub missing_priv {
     $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'})) {
         $r->print(&mt("in the group's file repository."));          $r->print(&mt("in the group's group portfolio."));
         $rtnlink .= &group_args()          $rtnlink .= &group_args()
     } else {      } else {
         $r->print(&mt('in this portfolio.'));          $r->print(&mt('in this portfolio.'));
Line 2134  sub get_quota { Line 2210  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 2179  sub handler { Line 2266  sub handler {
                 $r->print(&mt('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 [_1]', $group);               $title = &mt('Group portfolio for [_1]', $group); 
         } else {          } else {
             $r->print(&mt('Invalid group'));              $r->print(&mt('Invalid group'));
             $earlyout = 1;              $earlyout = 1;
Line 2207  sub handler { Line 2294  sub handler {
     } else {      } else {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom();
         $portfolio_root = &get_portfolio_root();          $portfolio_root = &get_portfolio_root();
         $title = &mt('Portfolio Manager');          $title = &mt('My Space');
         $can_modify = 1;          $can_modify = 1;
         $can_delete = 1;          $can_delete = 1;
         $can_upload = 1;          $can_upload = 1;
Line 2219  sub handler { Line 2306  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 2258  sub handler { Line 2359  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 2444  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 2460  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);
  &display_common($r,$url,$current_path,$is_empty,\@dir_list,   &display_common($r,$url,$current_path,$is_empty,\@dir_list,
  $can_upload);   $can_upload,$group);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,          &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);                             $can_upload,$can_modify,$can_delete,$can_setacl);
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());

Removed from v.1.191  
changed lines
  Added in v.1.225


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