[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.4 and 1.124

version 1.121.2.4, 2006/06/29 18:02:58 version 1.124, 2006/06/28 19:52:43
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 535  sub display_access { Line 530  sub display_access {
     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]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';      my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     my $info .=       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.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</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>';
  &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').  
  '<br /><ul><li>'.  
  &mt('Public files are available to anyone without the need for login.').  
  '</li><li>'.  
  &mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').  
  '</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 995  sub access_setting_table { Line 977  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 1447  sub upload { Line 1428  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 1506  sub upload { Line 1479  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 1589  sub get_portfolio_root { Line 1561  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 1734  sub handler { Line 1689  sub handler {
             $earlyout = 1;              $earlyout = 1;
         }          }
         if ($earlyout) { return OK; }          if ($earlyout) { return OK; }
         if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {          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;              $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.121.2.4  
changed lines
  Added in v.1.124

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