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

Diff for /loncom/interface/portfolio.pm between versions 1.121.2.8 and 1.161

version 1.121.2.8, 2006/07/19 21:59:10 version 1.161, 2006/08/24 17:38:21
Line 66  sub group_form_data { Line 66  sub group_form_data {
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath  # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {  sub make_anchor {
     my ($url, $filename, $current_path, $current_mode, $field_name,      my ($url, $anchor_fields, $inner_text) = @_;
         $continue_select) = @_;      if ($$anchor_fields{'continue'} ne 'true') {$$anchor_fields{'continue'} = 'false'};
     if ($continue_select ne 'true') {$continue_select = 'false'};      my $anchor = '<a href="'.$url.'?';
     my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;      foreach my $field_name (keys(%$anchor_fields)) {
           $anchor .= $field_name.'='.$$anchor_fields{$field_name}.'&amp;';
       }
       $anchor =~ s/&amp;$//;
     $anchor .= &group_args();      $anchor .= &group_args();
     $anchor .= '">'.$filename.'</a>';      $anchor .= '">'.$inner_text.'</a>';
     return $anchor;      return $anchor;
 }  }
   
Line 129  sub display_common { Line 132  sub display_common {
 TABLE  TABLE
     }      }
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');      my %anchor_fields = (
           'selectfile'    => $port_path,
           'currentpath'   => '/',
           'mode'          => $env{"form.mode"},
           'fieldname'     => $env{"form.fieldname"},
           'continue'      => $env{"form.continue"}
       );
       $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';              $newCurrentPath .= $tree[$i].'/';
             $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');              my %anchor_fields = (
                   'selectfile' => $tree[$i],
                   'currentpath' => '/',
                   'mode' => $env{"form.mode"},
                   'fieldname' => $env{"form.fieldname"},
                   'continue' => $env{"form.continue"}
               );
               $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/');
         }          }
     }      }
     $r->print('</span>');      $r->print('</span>');
Line 146  TABLE Line 163  TABLE
     $r->print("</form>");      $r->print("</form>");
 }  }
   
   sub display_directory_line {
       my ($r,$select_mode, $filename, $mtime, $size, $css_class,
    $line, $access_controls, $curr_access, $now, $version_flag,
    $href_location, $url, $current_path, $access_admin_text, $versions)=@_;
   
       my $fullpath =  &prepend_group($current_path.$filename);
       $r->print('<tr class="'.$css_class.'">');
       $r->print($line); # contains first two cells of table
       my $lock_info;
       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>'.$version_flag.'</td>');
       } else { # this is a graded or handed back file
           my ($user,$domain) = &get_name_dom();
           my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
           if (defined($$permissions_hash{$fullpath})) {
               foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
                   if (ref($array_item) eq 'ARRAY') {
                       if ($$array_item[-1] eq 'handback') {
                           $lock_info = 'Handback';
                       } elsif ($$array_item[-1] eq 'graded') {
                           $lock_info = 'Graded';
                       }
                    }
               }
           }
    if ($lock_info) {
       my %anchor_fields = ('lockinfo' => $fullpath);
       if ($versions) { # hold the folder open
           my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
           $fname =~ s|^/||;
           $anchor_fields{'showversions'} = $fname.'.'.$extension;
       }
       $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
    }
    $r->print('<td colspan="2">'.$lock_info.'</td>');
       }
       # $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
       $r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</td>'); 
       $r->print('<td>'.$size.'</td>');
       $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
       if ($select_mode ne 'true') {
    $r->print('<td><span style="white-space: nowrap">'.
     &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
           my %anchor_fields = (
               'access' => $filename,
               'currentpath' => $current_path
           );
    $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
       }
       $r->print('</tr>'.$/);
   }
   
 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)=@_;
Line 186  sub display_directory { Line 256  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('<table id="LC_browser">'.
             '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');              '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {      } else {
         $r->print('<form method="post" action="'.$url.'">');          $r->print('<form method="post" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.          $r->print('<table id="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');              '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }      }
     $r->print("\n".&group_form_data()."\n");      $r->print("\n".&group_form_data()."\n");
   
Line 198  sub display_directory { Line 268  sub display_directory {
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;      my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;      my @dir_lines;
     my %versioned;      my %versioned;
     foreach my $line (sort       foreach my $dir_line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
   my ($bfile)=split('&',$b,2);    my ($bfile)=split('&',$b,2);
Line 206  sub display_directory { Line 276  sub display_directory {
       } (@$dir_list)) {        } (@$dir_list)) {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$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);
     if ($version) {      if ($version) {
        $versioned{$fname} .= $version.",";      my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
          push(@{ $versioned{$fullpath} },
    [$filename,$dom,$testdir,$size,$mtime,$obs,]);
       } else {
          push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }      }
         push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);  
     }      }
     foreach my $line (@dir_lines) {      foreach my $dir_line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;          my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);          my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
          my $version_flag;
          my $show_versions;
       my $fullpath =  &prepend_group($current_path.$filename);
          if ($env{'form.showversions'} eq $filename) {
              $show_versions = 'true';
          }
          if (exists($versioned{$fullpath})) {
              my %anchor_fields = (
                  'selectfile' => $fullpath,
                  'continue' => 'false',
                  'currentpath' => $current_path,
              );
              if ($show_versions) {
                       $version_flag = &make_anchor('portfolio',\%anchor_fields,
                           '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
              } else {
                  $anchor_fields{'showversions'} = $filename;
                       $version_flag = &make_anchor('portfolio',\%anchor_fields,
                           '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                   }
          } else {
              $version_flag = '&nbsp;';
          }
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
  my $colspan='colspan="2"';   my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
Line 225  sub display_directory { Line 321  sub display_directory {
                 }                  }
  $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"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>');                   my %anchor_fields = (
                       'selectfile'    => $filename.'/',
                       'currentpath'   => $current_path.$filename.'/',
                       'mode'          => $env{"form.mode"},
                       'fieldname'     => $env{"form.fieldname"},
                       'continue'      => $env{"form.continue"}
                   );  
                   $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
  my $css_class = 'LC_browser_file';   my $css_class = 'LC_browser_file';
  my $line;   my $line;
                 my $version_flag;  
                 if (exists($versioned{$fname})) {  
                    $version_flag = "*";  
                 } else {  
                     $version_flag = "";  
                 }  
                my $fullpath = $current_path.$filename;  
                 $fullpath = &prepend_group($fullpath);  
                 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 246  sub display_directory { Line 341  sub display_directory {
     $line.=' /></td>';      $line.=' /></td>';
                 } else {                  } else {
                     if (exists $locked_files{$fullpath}) {                      if (exists $locked_files{$fullpath}) {
                         $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';                          my %anchor_fields = (
                               'lockinfo' => $fullpath
                           );
                           $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
  $css_class= 'LC_browser_file_locked';   $css_class= 'LC_browser_file_locked';
                     } else {                      } else {
                         if (!$can_modify) {                          if (!$can_modify) {
Line 258  sub display_directory { Line 356  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 alt="'.&mt('Catalog Information').                              my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';                              '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                             $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';                              my %anchor_fields = (
                             $line .= '</td><td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                                  'rename' => $filename,
                                   currentpath => $current_path
                               );
                               $line .= &make_anchor($url,\%anchor_fields,'Rename');
                               $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
                               # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
                 }                  }
  $r->print('<tr class="'.$css_class.'">');  
  $r->print($line);  
  my $curr_access;   my $curr_access;
  if ($select_mode ne 'true') {   if ($select_mode ne 'true') {
     my $pub_access = 0;      my $pub_access = 0;
Line 301  sub display_directory { Line 402  sub display_directory {
  $curr_access = join('+ ',@allaccesses);   $curr_access = join('+ ',@allaccesses);
     }      }
  }   }
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');                  &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line, 
  $r->print('<td><a href="'.$href_location.$filename.'">'.                                          \%access_controls, $curr_access,$now, $version_flag, $href_location, 
   $filename.'</a></td>');                                           $url, $current_path, $access_admin_text);
  $r->print('<td>'.$size.'</td>');   if ($show_versions) {
  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');      foreach my $dir_line (@{ $versioned{$fullpath} }) {
  if ($select_mode ne 'true') {          my ($v_filename,$dom,$testdir,$size,$mtime,$obs) =
     $r->print('<td><span style="white-space: nowrap">'.      @$dir_line;
       &mt($curr_access).'&nbsp;&nbsp;&nbsp;');                          $line = '<td colspan="2">&nbsp;</td>';
     $r->print('<a href="'.$url.'?access='.$filename.   &display_directory_line($r,$select_mode, $v_filename, $mtime, $size, 
       '&amp;currentpath='.$current_path.&group_args().   $css_class, $line, \%access_controls, $curr_access, $now,
       '">'.$access_admin_text.'</a></span></td>');   undef, $href_location, $url, $current_path, $access_admin_text, 1);
       }
  }   }
  $r->print('</tr>'.$/);  
             }              }
         }          }
     }      }
Line 399  sub done { Line 500  sub done {
     unless (defined $message) {      unless (defined $message) {
         $message='Done';          $message='Done';
     }      }
     my $result = '<h3><a href="'.$url.'?currentpath='.      my %anchor_fields = (
          $env{'form.currentpath'}.          'showversions' => $env{'form.showversions'},
          '&fieldname='.$env{'form.fieldname'}.          'currentpath' => $env{'form.currentpath'},
          '&mode='.$env{'form.mode'}.          'fieldname' => $env{'form.fieldname'},
  &group_args();          'mode'      => $env{'form.mode'}
     $result .= '">'.&mt($message).'</a></h3>';      );
       my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
     return $result;      return $result;
 }  }
   
Line 539  sub display_access { Line 641  sub display_access {
                                                                         $uname);                                                                          $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',      my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     $port_path.$env{'form.currentpath'}.      my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
     $env{'form.access'}).'</h3>';      $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
     my $info .=       $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
  &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').      $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
  '<br /><ul><li>'.      $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
  &mt('Public files are available to anyone without the need for login.').      $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
  '</li><li>'.      if ($group eq '') {
  &mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').          $info .= (&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 />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
  '</li>'.      }
  #'<li>'.      
  #&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').  
  #'<br />'.  
  #&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').  
  #'<br />'.  
  #&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').  
  '</li></ul>';  
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
Line 596  sub view_access_settings { Line 692  sub view_access_settings {
     } 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 />' ));
     }      }
     $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.      my %anchor_fields = (
               &group_args().'">'.&mt('Return to directory listing').'</a>');          'currentpath' => $env{'form.currentpath'}
       );
       $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
     return;      return;
 }  }
   
Line 730  sub update_access { Line 828  sub update_access {
         }          }
     }      }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve portfolio 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();
Line 821  sub update_access { Line 919  sub update_access {
         }          }
         &close_form($r,$url);          &close_form($r,$url);
     } else {      } else {
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.          my %anchor_fields = (
                   '&amp;currentpath='.$env{'form.currentpath'}.&group_args().'">'.              'currentpath' => $env{'form.currentpath'},
                    &mt('Display all access settings for this file').'</a>'.              'access' => $env{'form.selectfile'}
                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.          );
                   '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.          $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
                   &group_args().'">'.&mt('Return to directory listing').'</a>');          delete $anchor_fields{'access'};
           $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
     }      }
     return;      return;
 }  }
Line 996  sub access_setting_table { Line 1095  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $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></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
     #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');      &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
     #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);      $r->print('</td><td>&nbsp;</td><td valign="top">');
     #$r->print('</td><td>&nbsp;</td><td valign="top">');      &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
     #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
     #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('<td colspan="3" valign="top">');
     #    $r->print('<td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td valign="top">');
     #    $r->print('<td valign="top">');      }
     #}      &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
     #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);      $r->print('</td>');
     #$r->print('</td>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
     #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td>&nbsp;</td><td valign="top">');
     #    $r->print('<td>&nbsp;</td><td valign="top">');      }
     #}      &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);  
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
Line 1468  sub upload { Line 1566  sub upload {
             $file_name = $env{'form.currentpath'}.$file_name;              $file_name = $env{'form.currentpath'}.$file_name;
             $file_name = &prepend_group($file_name);              $file_name = &prepend_group($file_name);
             $found_file = 1;              $found_file = 1;
     # FIXME I think this is incorrect, prepend_group took care of this?  
             if (defined($group)) {  
                 $file_name = $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') {
                 $locked_file = 1;                  $locked_file = 1;
             }               } 
Line 1515  sub lock_info { Line 1609  sub lock_info {
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     if (defined($file_name) && defined($$current_permissions{$file_name})) {      if (defined($file_name) && defined($$current_permissions{$file_name})) {
         foreach my $array_item (@{$$current_permissions{$file_name}}) {          foreach my $array_item (@{$$current_permissions{$file_name}}) {
             if (ref($array_item) eq 'ARRAY') {              next if (ref($array_item) ne 'ARRAY');
                 my $filetext;  
                 if (defined($group)) {      my $filetext;
                     $filetext = '<strong>'.$env{'form.lockinfo'}.      if (defined($group)) {
                                     '</strong> (group: '.$group.')';    $filetext = '<strong>'.$env{'form.lockinfo'}.
                 } else {      '</strong> (group: '.$group.')'; 
                     $filetext = '<strong>'.$file_name.'</strong>';      } else {
                 }    $filetext = '<strong>'.$file_name.'</strong>';
                 $r->print(&mt('[_1] was submitted in response to problem: ',      } 
                               $filetext).      
                           '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).      my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
                           '</strong><br />');   '</strong><br />';
                 my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);      if ($$array_item[-1] eq 'graded') {
                 $r->print(&mt('In the course: <strong>[_1]</strong><br />',   $r->print(&mt('[_1] was submitted in response to problem: [_2]',
                               $course_description{'description'}));                                $filetext,$title));
                 # $r->print('the third is '.$$array_item[2].'<br>');      } elsif ($$array_item[-1] eq 'handback') {
                 # $r->print("item is $$array_item[0]<br> and $$array_item[0]");   $r->print(&mt('[_1] was handed back in response to problem: [_2]',
             }                                $filetext,$title));
       } else {
    # submission style lock
    $r->print(&mt('[_1] was submitted in response to problem: [_2]',
                                 $filetext,$title));
       }
       my %course_description = 
    &Apache::lonnet::coursedescription($$array_item[1]);
       if ( $course_description{'description'} ne '') {
    $r->print(&mt('In the course: <strong>[_1]</strong><br />',
         $course_description{'description'}));
       }
         }          }
     }      }
     $r->print(&done('Back',$url));      $r->print(&done('Back',$url));
Line 1578  sub createdir { Line 1683  sub createdir {
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($uname,$udom) = &get_name_dom();      my ($udom,$uname) = @_;
       if (!(defined($udom)) || !(defined($uname))) {
           ($uname,$udom) = &get_name_dom();
       }
     my $path;      my $path;
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
         $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';          $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
Line 1712  sub handler { Line 1820  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',           ['selectfile','currentpath','meta','lockinfo','currentfile','action',
   'fieldname','mode','rename','continue','group','access','setnum',    'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles']);            'cnum','cdom','type','setroles','showversions','ref']);
     my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);      my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {      if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;          $url = $1.$2;
         $caller = $2;          $caller = $2;
Removed from v.1.121.2.8  
changed lines
  Added in v.1.161

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