Diff for /loncom/interface/portfolio.pm between versions 1.142 and 1.144

version 1.142, 2006/08/02 03:05:10 version 1.144, 2006/08/04 20:41:32
Line 339  sub display_directory { Line 339  sub display_directory {
     foreach my $dir_line (@version_lines) {      foreach my $dir_line (@version_lines) {
         my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;          my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
                         my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);                          my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
                           $line = '<td colspan="2">&nbsp;</td>';
                         if (($v_fname eq $fname)&&($v_extension eq $extension)) {                          if (($v_fname eq $fname)&&($v_extension eq $extension)) {
             &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size,               &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, 
                             $css_class, $line, \%access_controls, $curr_access, $now,                              $css_class, $line, \%access_controls, $curr_access, $now,
Line 1475  sub upload { Line 1476  sub upload {
         }          }
     }      }
     $fname=&Apache::lonnet::clean_filename($fname);      $fname=&Apache::lonnet::clean_filename($fname);
   
     my $portfolio_root=&get_portfolio_root();      my $portfolio_root=&get_portfolio_root();
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
Line 1595  sub createdir { Line 1595  sub createdir {
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($uname,$udom) = &get_name_dom();      my ($udom,$uname) = @_;
       if (!defined($uname) || !defined($udom)) {
    ($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';

Removed from v.1.142  
changed lines
  Added in v.1.144


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