Diff for /loncom/interface/portfolio.pm between versions 1.124 and 1.127

version 1.124, 2006/06/28 19:52:43 version 1.127, 2006/07/02 23:15:47
Line 1 Line 1
   # The LearningOnline Network
   # portfolio browser
   #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 292  sub display_directory { Line 297  sub display_directory {
       &mt($curr_access).'   ');        &mt($curr_access).'   ');
     $r->print('<a href="'.$url.'?access='.$filename.      $r->print('<a href="'.$url.'?access='.$filename.
       '&amp;currentpath='.$current_path.$groupecho.        '&amp;currentpath='.$current_path.$groupecho.
       '">'.$access_admin_text.'</a></span>');        '">'.$access_admin_text.'</a></span></td>');
  }   }
  $r->print('</td></tr>'.$/);   $r->print('</tr>'.$/);
             }              }
         }          }
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('</table>          $r->print('</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 />              <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 1428  sub upload { Line 1433  sub upload {
     my $fname=$env{'form.uploaddoc.filename'};      my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)      my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k      my $disk_quota = 20000; # expressed in k
       if (defined($group)) {
           my $grp_quota = &get_group_quota($group); # quota expressed in k 
           if ($grp_quota ne '') {
               $disk_quota = $grp_quota;
           } else {
               $disk_quota = 0;
           }
       }
     $fname=&Apache::lonnet::clean_filename($fname);      $fname=&Apache::lonnet::clean_filename($fname);
   
     my $portfolio_root=&get_portfolio_root($group);      my $portfolio_root=&get_portfolio_root($group);
Line 1479  sub upload { Line 1492  sub upload {
         }          }
     }      }
 }  }
   
 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 1561  sub get_portfolio_root { Line 1575  sub get_portfolio_root {
     return (&Apache::loncommon::propath($udom,$uname).$path);      return (&Apache::loncommon::propath($udom,$uname).$path);
 }  }
   
   sub get_group_quota {
       my ($group) = @_;
       my $group_quota; 
       my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
       my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
       if (%curr_groups) {
           my %group_info =  &Apache::longroup::get_group_settings(
                                                       $curr_groups{$group});
           $group_quota = $group_info{'quota'}; #expressed in Mb
           if ($group_quota) {
               $group_quota = 1000 * $group_quota; #expressed in k
           } 
       }
       return $group_quota;
   } 
   
 sub get_dir_list {  sub get_dir_list {
     my ($portfolio_root,$group) = @_;      my ($portfolio_root,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 1689  sub handler { Line 1720  sub handler {
             $earlyout = 1;              $earlyout = 1;
         }          }
         if ($earlyout) { return OK; }          if ($earlyout) { return OK; }
         if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {          if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
             $can_setacl = 1;  
         }  
         if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {  
             $can_upload = 1;  
         }  
         if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {  
             $can_modify = 1;              $can_modify = 1;
         }  
         if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {  
             $can_delete = 1;              $can_delete = 1;
               $can_upload = 1;
               $can_setacl = 1;
           } else {
               if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
                   $can_setacl = 1;
               }
               if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
                   $can_upload = 1;
               }
               if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
                   $can_modify = 1;
               }
               if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
                   $can_delete = 1;
               }
         }          }
     } else {      } else {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom();

Removed from v.1.124  
changed lines
  Added in v.1.127


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