Diff for /loncom/interface/portfolio.pm between versions 1.245 and 1.268

version 1.245, 2013/05/03 17:53:02 version 1.268, 2023/12/28 18:14:07
Line 98  sub display_common { Line 98  sub display_common {
  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'));          my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
         $r->print(&display_usage($group));          $r->print(&display_portfolio_usage($group,$help_portfolio));
         my $parse_check;          my $parse_check;
         if (!&suppress_embed_prompt()) {          if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";              $parse_check = <<"END";
Line 112  sub display_common { Line 112  sub display_common {
 END  END
         }          }
   
         $r->print('<div>'.$help_portfolio);          # Find space available before uploading
           my $free_space = &free_space($group);
   
         # Upload File          # Upload File
         $r->print('<div class="LC_left_float">'          $r->print('<div class="LC_left_float">'
                  .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'                   .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
                  .'<fieldset>'                   .'<fieldset>'
                  .'<legend>'.$lt{'upload_label'}.'</legend>'                   .'<legend>'.$lt{'upload_label'}.'</legend>'
                  .$groupitem                    .$groupitem 
                  .'<input name="uploaddoc" type="file" />'                   .'<input name="uploaddoc" type="file" class="LC_flUpload" />'
                    .'<input type="hidden" id="LC_free_space" value="'.$free_space.'" />'
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'                   .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'                   .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
                  .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'                   .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
Line 149  END Line 152  END
                  .'</form>'                   .'</form>'
                  .'</div>'                   .'</div>'
         );          );
         $r->print('</div>');  
     } # end "if can_upload"      } # end "if can_upload"
   
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
Line 188  END Line 190  END
     $r->print("</form>");      $r->print("</form>");
 }  }
   
 sub display_usage {  sub display_portfolio_usage {
     my ($group) = @_;      my ($group,$helpitem) = @_;
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     my $getpropath = 1;      my $getpropath = 1;
     my $portfolio_root = &get_portfolio_root();      my $portfolio_root = &get_portfolio_root();
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $current_disk_usage =      my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);           &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
     my $usage = $current_disk_usage/1000;      return &Apache::loncommon::head_subbox(
     my $quota = $disk_quota/1000;                       '<div style="float:right;padding-top:0;margin-top;0">'
     my $percent;                      .$helpitem
     if ($disk_quota == 0) {                      .'</div>'
         $percent = 100.0;                      .'<div>'
     } else {                      .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
         $percent = 100*($current_disk_usage/$disk_quota);                                                             $disk_quota,'portfolio')
     }                      .'</div>');
     $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 {
Line 259  sub display_directory_line { Line 237  sub display_directory_line {
  if ($lock_info) {   if ($lock_info) {
     my %anchor_fields = ('lockinfo' => $fullpath);      my %anchor_fields = ('lockinfo' => $fullpath);
     if ($versions) { # hold the folder open      if ($versions) { # hold the folder open
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);          my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath);
         $fname =~ s|^/||;          $fname =~ s|^/||;
         $anchor_fields{'showversions'} = $fname.'.'.$extension;          $anchor_fields{'showversions'} = $fname.'.'.$extension;
     }      }
Line 289  sub display_directory_line { Line 267  sub display_directory_line {
   
 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,$can_viewacl)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $select_mode;      my $select_mode;
     my $checked_files;      my $checked_files;
     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);
     my $access_admin_text = &mt('View Status');      my $access_admin_text;
       if ($can_viewacl) {
           $access_admin_text = &mt('View Status');
       }
     if ($can_setacl) {      if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');          $access_admin_text = &mt('View/Change Status');
     }      }
Line 392  sub display_directory { Line 373  sub display_directory {
           } (@{$dir_list})) {            } (@{$dir_list})) {
        my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_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::lonnet::file_name_version_ext($filename);
        if ($version) {         if ($version) {
         my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);          my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
            push(@{ $versioned{$fullpath} },             push(@{ $versioned{$fullpath} },
Line 405  sub display_directory { Line 386  sub display_directory {
     my $zerobyte;      my $zerobyte;
     foreach my $dir_line (@dir_lines) {      foreach my $dir_line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_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::lonnet::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 $version_flag;
        my $show_versions;         my $show_versions;
Line 509  sub display_directory { Line 490  sub display_directory {
     my $cond_access = 0;      my $cond_access = 0;
     foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {      foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
  my ($num,$scope,$end,$start) = &unpack_acc_key($key);   my ($num,$scope,$end,$start) = &unpack_acc_key($key);
                           next if ($scope eq 'ip');   
  if (($now > $start) && (!$end || $end > $now)) {   if (($now > $start) && (!$end || $end > $now)) {
     if ($scope eq 'public')  {      if ($scope eq 'public')  {
  $pub_access = 1;   $pub_access = 1;
Line 536  sub display_directory { Line 518  sub display_directory {
     }      }
  }   }
                 &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line,                   &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line, 
                                         \%access_controls, $curr_access,$now, $version_flag, $href_location,                                           \%access_controls, $curr_access, $now, $version_flag, $href_location, 
                                         $url, $current_path, $access_admin_text);                                          $url, $current_path, $access_admin_text);
  if ($show_versions) {   if ($show_versions) {
     foreach my $dir_line (@{ $versioned{$fullpath} }) {      foreach my $dir_line (@{ $versioned{$fullpath} }) {
Line 563  sub display_directory { Line 545  sub display_directory {
             <input type="hidden" name="mode" value="selectfile" />              <input type="hidden" name="mode" value="selectfile" />
             <p>              <p>
             <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />              <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').'" />              <input type="button" name="doit" onclick="finishSelect();" value="'.&mt('Select checked files, and close window').'" />
             </p>              </p>
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
         </form>');                  </form>');        
Line 909  sub access_for_renamed { Line 891  sub access_for_renamed {
 }  }
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;      my ($r,$url,$group,$can_setacl,$can_viewacl,$port_path,$action) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};      my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
Line 919  sub display_access { Line 901  sub display_access {
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my ($header,$info);      my ($header,$info);
     if ($action eq 'chgaccess') {      if ($action eq 'chgaccess') {
           my $uhome = &Apache::lonnet::homeserver($uname,$udom);
           my $prefix = &Apache::lonnet::url_prefix($r,$udom,$uhome,'web');
         $header =          $header =
             '<h2>'              '<h2>'
             .&mt('Allowing others to retrieve file: [_1]'              .&mt('Allowing others to retrieve file: [_1]'
Line 931  sub display_access { Line 915  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\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";                    &mt('A listing of files viewable without log-in is available at: ')."<a href=\"$prefix/adm/$udom/$uname/aboutme/portfolio\">$prefix/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\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";          $info .= "<br /><a href=\"$prefix/adm/$udom/$uname/aboutme\">$prefix/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 course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'<br />';
         }          }
     } else {      } else {
         $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.          $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
Line 958  sub display_access { Line 942  sub display_access {
                         'cancel' => &mt('Return to directory'),                          'cancel' => &mt('Return to directory'),
                       };                        };
         &close_form($r,$url,$button_text);          &close_form($r,$url,$button_text);
     } else {      } elsif ($can_viewacl) {
         $r->print($header);          $r->print($header);
         if ($aclcount) {            if ($aclcount) {  
             $r->print($info);              $r->print($info);
         }          }
         &view_access_settings($r,$url,$access_controls{$file_name},$aclcount);          &view_access_settings($r,$url,$access_controls{$file_name},$aclcount);
       } else {
           $r->print($header);
           $r->print(&mt('You do not have sufficient privileges to view access controls').'<br />');
     }      }
       my %anchor_fields = (
           'currentpath' => $env{'form.currentpath'}
       );
       $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory')));
       return;
 }  }
   
 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 users who satisfy the conditions you set.').'<br /><ul>'.
         &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').'<br />'."\n".          '<li>'.&mt('Conditions can be IP-based, in which case no log-in is required').'</li>'.
         &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');          '<li>'.&mt("Conditions can also be based on a user's status, in which case the user needs an account in the LON-CAPA network, and needs to be logged in.").'<br />'."\n".
           &mt('The status-based 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.').'</li></ul>';
 }  }
   
 sub view_access_settings {  sub view_access_settings {
Line 1012  sub build_access_summary { Line 1006  sub build_access_summary {
                       domains => 'Conditional: domain-based',                        domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',                        users => 'Conditional: user-based',
                       course => 'Conditional: course/community-based',                        course => 'Conditional: course/community-based',
                         userip => 'Conditional: IP-based',
                      );                       );
     my @allscopes = ('public','guest','domains','users','course');      my @allscopes = ('public','guest','domains','users','course','userip');
     foreach my $scope (@allscopes) {      foreach my $scope (@allscopes) {
         if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {          if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
             next;              next;
Line 1090  sub build_access_summary { Line 1085  sub build_access_summary {
                 } elsif ($scope eq 'users') {                  } elsif ($scope eq 'users') {
                     my $curr_user_list = &sort_users($content->{'users'});                      my $curr_user_list = &sort_users($content->{'users'});
                     $r->print(&mt('Users: ').$curr_user_list);                      $r->print(&mt('Users: ').$curr_user_list);
                   } elsif ($scope eq 'userip') {
                       my $curr_ips_list = &sort_ips($content->{'userip'});
                       $r->print(&mt('IP(s):').' '.$curr_ips_list);
                 } else {                  } else {
                     $r->print('&nbsp;');                      $r->print('&nbsp;');
                 }                  }
Line 1198  sub update_access { Line 1196  sub update_access {
     my $totalnew = 0;      my $totalnew = 0;
     my $status = 'new';      my $status = 'new';
     my ($firstitem,$lastitem);      my ($firstitem,$lastitem);
     my @types = ('course','domains','users');      my @types = ('course','domains','users','userip');
     foreach my $newitem (@types) {      foreach my $newitem (@types) {
         $allnew += $env{'form.new'.$newitem};          $allnew += $env{'form.new'.$newitem};
     }      }
Line 1206  sub update_access { Line 1204  sub update_access {
         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);
         my %showtypes = &Apache::lonlocal::texthash (          my %showtypes = (
            course  => 'course/community',             course  => 'course/community',
            domains => 'domain',             domains => 'domain',
            users   => 'user',             users   => 'user',
              userip  => 'IP',
         );          );
         foreach my $newitem (@types) {          foreach my $newitem (@types) {
             if ($env{'form.new'.$newitem} > 0) {              next if ($env{'form.new'.$newitem} <= 0);
                 $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 />');              $r->print(
                 $firstitem = $totalnew;                  '<p>'
                 $lastitem = $totalnew + $env{'form.new'.$newitem};                 .&mt('Add new [_1]'.$showtypes{$newitem}.'-based[_2] access control for portfolio file: [_3]',
                 $totalnew = $lastitem;                      '<b>','</b>',
                 my @numbers;                         '<span class="LC_filename"><b>'
                 for (my $i=$firstitem; $i<$lastitem; $i++) {                     .$env{'form.currentpath'}.$env{'form.selectfile'}.'</b></span>')
                     push(@numbers,$i);                 .'</p>');
                 }              $firstitem = $totalnew;
                 &display_access_row($r,$status,$newitem,\@numbers,              $lastitem = $totalnew + $env{'form.new'.$newitem};
                                     $access_controls{$file_name},$now,$then);              $totalnew = $lastitem;
               my @numbers;   
               for (my $i=$firstitem; $i<$lastitem; $i++) {
                   push(@numbers,$i);
             }              }
               &display_access_row($r,$status,$newitem,\@numbers,
                                   $access_controls{$file_name},$now,$then);
         }          }
         &close_form($r,$url);          &close_form($r,$url);
     } else {      } else {
Line 1308  sub build_access_record { Line 1312  sub build_access_record {
  'udom'  => $udom   'udom'  => $udom
  });   });
  }   }
       } elsif ($scope eq 'userip') {
           my $ipslist = $env{'form.ips_'.$num};
           $ipslist =~ s/\s+//sg;
           my %ipshash = map { ($_,1) } (split(/,/,$ipslist));
           foreach my $ip (keys(%ipshash)) {
               push(@{$record->{'ip'}},$ip);
           }
     }      }
     return $record;      return $record;
 }  }
Line 1333  sub sort_users { Line 1344  sub sort_users {
     return $curr_user_list;      return $curr_user_list;
 }  }
   
   sub sort_ips {
       my ($ips) = @_;
       if (ref($ips) eq 'ARRAY') {
           return join(",\n",sort(@{$ips}));
       }
   }
   
 sub access_setting_table {  sub access_setting_table {
     my ($r,$url,$filename,$access_controls,$action) = @_;      my ($r,$url,$filename,$access_controls,$action) = @_;
     my ($public,$publictext);      my ($public,$publictext);
Line 1342  sub access_setting_table { Line 1360  sub access_setting_table {
     my @courses = ();      my @courses = ();
     my @domains = ();      my @domains = ();
     my @users = ();      my @users = ();
       my @ips = ();
     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.
     my ($num,$scope,$publicnum,$guestnum);      my ($num,$scope,$publicnum,$guestnum);
Line 1364  sub access_setting_table { Line 1383  sub access_setting_table {
                 push(@domains,$key);                  push(@domains,$key);
             } elsif ($scope eq 'users') {              } elsif ($scope eq 'users') {
                 push(@users,$key);                  push(@users,$key);
               } elsif ($scope eq 'userip') {
                   push(@ips,$key);
             }              }
         }          }
         $acl_count{$scope} ++;          $acl_count{$scope} ++;
Line 1375  sub access_setting_table { Line 1396  sub access_setting_table {
                            $guesttext,$access_controls,%conditionals);                             $guesttext,$access_controls,%conditionals);
     } else {      } else {
         &condition_setting($r,$access_controls,$now,$then,\%acl_count,          &condition_setting($r,$access_controls,$now,$then,\%acl_count,
                            \@domains,\@users,\@courses);                             \@domains,\@users,\@courses,\@ips);
     }      }
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
Line 1420  sub standard_settings { Line 1441  sub standard_settings {
     $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>'.      $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr>'.
               '<tr><td colspan="3">');                '<tr><td colspan="3" valign="top">');
     my $numconditionals = 0;      my $numconditionals = 0;
     my $conditionstext;      my $conditionstext;
     my %cond_status;      my %cond_status;
     foreach my $scope ('domains','users','course') {      foreach my $scope ('domains','users','course','userip') {
         $numconditionals += $acl_count->{$scope};           $numconditionals += $acl_count->{$scope}; 
         if ($acl_count->{$scope} > 0) {          if ($acl_count->{$scope} > 0) {
             if ($conditionstext ne 'Active') {               if ($conditionstext ne 'Active') {
                 foreach my $key (keys(%{$conditionals{$scope}})) {                  foreach my $key (keys(%{$conditionals{$scope}})) {
                     $conditionstext = &acl_status($start->{$key},$end->{$key},$now);                      $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
                     if ($conditionstext eq 'Active') {                      if ($conditionstext eq 'Active') {
Line 1458  sub standard_settings { Line 1479  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/community affiliation.'));          $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt("based on domain, username, course/community affiliation or user's IP address."));
     }      }
 }  }
   
 sub condition_setting {  sub condition_setting {
     my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;      my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses,$ips) = @_;
     $r->print('<tr><td valign="top">');      $r->print('<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><td valign="top">');
     if ($acl_count->{course} > 0) {  
         $r->print('<td colspan="3" valign="top">');  
     } else {  
         $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><td>&nbsp;</td><td valign="top">');
       &access_element($r,'userip',$acl_count,$ips,$access_controls,$now,$then);
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
Line 1492  sub acl_status { Line 1509  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 %typetext = &Apache::lonlocal::texthash(      my %typetext = (
         domains => 'Domain',          domains => 'Domain',
         users   => 'User',          users   => 'User',
         course  => 'Course/Community'          course  => 'Course/Community',
           userip  => 'IP',
     );      );
     $r->print('<h3>'.&mt('[_1]-based conditional access: ',$typetext{$type}));      $r->print('<h3>'.&mt($typetext{$type}.'-based conditional access:').' ');
     if ($$acl_count{$type}) {      if ($$acl_count{$type}) {
         $r->print($$acl_count{$type}.' ');          $r->print(&mt('[quant,_1,condition]',$$acl_count{$type}));
         if ($$acl_count{$type} > 1) {  
             $r->print(&mt('conditions'));  
         } else {  
             $r->print(&mt('condition'));  
         }  
     } else {      } else {
         $r->print(&mt('Off'));          $r->print(&mt('Off'));
     }      }
Line 1515  sub access_element { Line 1528  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;      my ($showtype, $infotype);
     if ($type eq 'course') {      if ($type eq 'course') {
         $showtype = &mt('Courses/Communities');          $showtype = &mt('Courses/Communities');
           $infotype = 'Course/Community';
     } elsif ($type eq 'domains') {      } elsif ($type eq 'domains') {
         $showtype = &mt('Domains');          $showtype = &mt('Domains');
           $infotype = 'Domain';
     } elsif ($type eq 'users') {      } elsif ($type eq 'users') {
         $showtype = &mt('Users');          $showtype = &mt('Users');
           $infotype = 'User';
       } elsif ($type eq 'userip') {
           $showtype = &mt('IP-based');
           $infotype = 'IP';  
     }      }
     if (@{$items} > 0) {      if (@{$items} > 0) {
         my @all_doms;          my @all_doms;
Line 1531  sub display_access_row { Line 1550  sub display_access_row {
         $r->print('<th>'.&mt('Action?').'</th><th>'.$showtype.'</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 course/community affiliations').              $r->print('<th>'.&mt('Allowed course/community affiliations').
                       '</th>');                        '</th>');
             $colspan ++;              $colspan ++;
Line 1548  sub display_access_row { Line 1566  sub display_access_row {
                             $then);                              $then);
             } elsif ($type eq 'users') {              } elsif ($type eq 'users') {
                 &users_row($r,$status,$key,$access_controls,$now,$then);                  &users_row($r,$status,$key,$access_controls,$now,$then);
               } elsif ($type eq 'userip') {
                   &ips_row($r,$status,$key,$access_controls,$now,$then);
             }              }
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
         }          }
Line 1559  sub display_access_row { Line 1579  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.',$showtype).'<br />'.          $r->print(
                   &additional_item($type));              '<p class="LC_info">'
              .&mt('No '.$infotype.'-based conditions defined')
              .'</p>'
              .&additional_item($type)
           );
     }      }
     return;      return;
 }  }
Line 1568  sub display_access_row { Line 1592  sub display_access_row {
 sub course_js {  sub course_js {
     return qq|      return qq|
 <script type="text/javascript">  <script type="text/javascript">
   // <![CDATA[
 function setRoleOptions(num,roleid,cdom,cnum,type) {  function setRoleOptions(num,roleid,cdom,cnum,type) {
     updateIndexNum = getIndexByValue('update',num);      updateIndexNum = getIndexByValue('update',num);
     var addItem = 'add_role_'+num;      var addItem = 'add_role_'+num;
Line 1607  function getIndexByValue(name,value) { Line 1632  function getIndexByValue(name,value) {
     return -1;      return -1;
 }  }
   
   // ]]>
 </script>  </script>
 |;  |;
 }  }
Line 1659  sub course_row { Line 1685  sub course_row {
         }          }
         $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'}',
                   '$showtype'".')" value="" />');                    '$showtype'".')" value="" />');
         $newrole_id = $max_id;          $newrole_id = $max_id;
Line 1720  sub users_row { Line 1746  sub users_row {
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc  ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30"  rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');      $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt("Format for users' username:domain information:").'<br /><tt>sparty:msu,illini:uiuc  ... etc.</tt><br /><textarea name="users_'.$num.'" cols="30"  rows="5">'.$curr_user_list.'</textarea></td><td>'.&dateboxes($num,$start,$end).'</td>');
 }  }
   
   sub ips_row {
       my ($r,$status,$item,$access_controls,$now,$then) = @_;
       my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
                                                       'userip');
       my $curr_ips_list;
       if ($status eq 'old') {
           my $content = $$access_controls{$item};
           $curr_ips_list = &sort_ips($content->{'userip'});
       }
       $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt('Format for IP controls').'<br />'.
                 &mt('[_1] or [_2] or [_3] or [_4] or [_5]','<tt>35.8.*</tt>','<tt>35.8.3.[34-56]</tt>',
                     '<tt>*.msu.edu</tt>','<tt>35.8.3.34</tt>','<tt>somehostname.pa.msu.edu</tt>').'<br />'.
                 &mt('Use a comma to separate different ranges.').'</br/>'.
                 '<textarea name="ips_'.$num.'" cols="30"  rows="5">'.$curr_ips_list.'</textarea></td>'.
                 '<td>'.&dateboxes($num,$start,$end).'</td>');
   }
   
 sub additional_item {  sub additional_item {
     my ($type) = @_;      my ($type) = @_;
     my $showtype;      my $showtype;
     if ($type eq 'course') {      if ($type eq 'course') {
         $showtype = &mt('course/community');          $showtype = 'course/community';
     } elsif ($type eq 'domains') {      } elsif ($type eq 'domains') {
         $showtype = &mt('domains');          $showtype = 'domain';
     } elsif ($type eq 'users') {      } elsif ($type eq 'users') {
         $showtype = &mt('users');          $showtype = 'user';
       } elsif ($type eq 'userip') {
           $showtype = 'IP';
     }      }
     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
     return $output;          &mt('Add new '.$showtype.'-based condition(s)?')
          .'&nbsp;'.&mt('Number to add: ')
          .'<input type="text" name="new'.$type.'" size="3" value="0" />';
 }  }
   
 sub actionbox {  sub actionbox {
Line 1739  sub actionbox { Line 1786  sub actionbox {
     my $output = '<span class="LC_nobreak"><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' || $scope eq 'userip') {
             $checkstate = 'checked="checked"';              $checkstate = 'checked="checked"';
         }          }
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.          $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
Line 1751  sub actionbox { Line 1798  sub actionbox {
                    '<label><input type="checkbox" name="update" value="'.                     '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');                     $num.'" />'.&mt('Update');
     }      }
     $output .= '</label></span><input type="hidden" name="scope_'.$num.                '" value="'.$scope.'" />';      $output .= '</label></span><input type="hidden" name="scope_'.$num.'" value="'.$scope.'" />';
     return $output;      return $output;
 }  }
                                                                                                                                                                         
Line 2416  sub get_group_quota { Line 2463  sub get_group_quota {
     if (%curr_groups) {      if (%curr_groups) {
         my %group_info =  &Apache::longroup::get_group_settings(          my %group_info =  &Apache::longroup::get_group_settings(
                                                     $curr_groups{$group});                                                      $curr_groups{$group});
         $group_quota = $group_info{'quota'}; #expressed in Mb          $group_quota = $group_info{'quota'}; #expressed in MB
         if ($group_quota) {          if ($group_quota) {
             $group_quota = 1000 * $group_quota; #expressed in k              $group_quota = 1000 * $group_quota; #expressed in k
         }          }
Line 2480  sub missing_priv { Line 2527  sub missing_priv {
                       delete => 'delete files',                        delete => 'delete files',
                       rename => 'rename files',                        rename => 'rename files',
                       setacl => 'set access controls for files',                        setacl => 'set access controls for files',
                         viewacl => 'view access controls for files',
     );      );
     my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');      my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
     my $rtnlink = '<a href="'.$url;      my $rtnlink = '<a href="'.$url;
Line 2516  sub coursegrp_portfolio_header { Line 2564  sub coursegrp_portfolio_header {
     }      }
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",          ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
           text=>"$ucgpterm: $grp_desc",            text=>&mt('Group').": $grp_desc",
           title=>"Go to group's home page"},            title=>&mt("Go to group's home page"),
             no_mt=>1},
          {href=>"/adm/coursegrp_portfolio?".&group_args(),           {href=>"/adm/coursegrp_portfolio?".&group_args(),
           text=>"Group Portfolio",            text=>"Group Portfolio",
           title=>"Display group portfolio"});            title=>"Display group portfolio"});
     my $output = &Apache::lonhtmlcommon::breadcrumbs(      my $output = &Apache::lonhtmlcommon::breadcrumbs(
                          &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));                           &mt('Group portfolio files - [_1]',$grp_desc),
                                                        undef,undef,undef,undef,1);
     return $output;      return $output;
 }  }
   
Line 2538  sub get_quota { Line 2588  sub get_quota {
         }          }
     } else {      } else {
         $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},          $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
                                     $env{'user.domain'}); #expressed in Mb                                      $env{'user.domain'}); #expressed in MB
         $disk_quota = 1000 * $disk_quota; # convert from Mb to kb          $disk_quota = 1024 * $disk_quota; # convert from MB to kB
     }      }
     return $disk_quota;      return $disk_quota;
 }  }
Line 2569  STATE Line 2619  STATE
     return $state;      return $state;
 }  }
   
   # Find space available in a user's portfolio (convert to bytes)
   sub free_space {
       my ($group) = @_;
       my $disk_quota = &get_quota($group); # Expressed in kB
       my ($uname,$udom) = &get_name_dom($group);
       my $portfolio_root = &get_portfolio_root();
       my $getpropath = 1;
       my $current_disk_usage = &Apache::lonnet::diskusage($udom, $uname,
                                $portfolio_root, $getpropath); # Expressed in kB
       my $free_space = 1024 * ($disk_quota - $current_disk_usage);
       return $free_space;
   }
   
   sub valid_container {
       my ($uname,$udom,$group) = @_;
       my $container_prefix;
       if ($group ne '') {
           $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio";
       } else {
           $container_prefix = "/uploaded/$udom/$uname/portfolio";
       }
       if ($env{'form.currentpath'}) {
           $container_prefix .= $env{'form.currentpath'};
       } else {
           $container_prefix .= '/';
       }
       if ($env{'form.container'} =~ m{^\Q$container_prefix\E(.+)$}) {
           my $filename = $1;
           if ($filename eq &Apache::lonnet::clean_filename($filename)) {
               return 1;
           }
       }
       return;
   }
   
   sub invalid_parms {
       my ($r,$url,$currentpath) = @_;
       my $escpath = &HTML::Entities::encode($currentpath,'&<>"');
       my $rtnlink = '<a href="'.$url;
       if ($url =~ /\?/) {
           $rtnlink .= '&';
       } else {
           $rtnlink .= '?';
       }
       $rtnlink .= 'currentpath='.$escpath;
       $rtnlink .= '">'.&mt('Return to directory').'</a>';
       $r->print('<h3>'.&mt('Action disallowed').'</h3>');
       $r->print(&mt('Some of the data included with this request were invalid'));
       $r->print('<br />'.$rtnlink);
       return;
   }
   
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
Line 2581  sub handler { Line 2683  sub handler {
         $url = $1.$2;          $url = $1.$2;
         $caller = $2;          $caller = $2;
     }      }
     my ($can_modify,$can_delete,$can_upload,$can_setacl);      my ($can_modify,$can_delete,$can_upload,$can_setacl,$can_viewacl);
     if ($caller eq 'coursegrp_portfolio') {      if ($caller eq 'coursegrp_portfolio') {
     #  Needs to be in a course      #  Needs to be in a course
         if (! ($env{'request.course.fn'})) {          if (! ($env{'request.course.fn'})) {
Line 2625  sub handler { Line 2727  sub handler {
             $can_delete = 1;              $can_delete = 1;
             $can_upload = 1;              $can_upload = 1;
             $can_setacl = 1;              $can_setacl = 1;
               $can_viewacl = 1;
         } else {          } else {
             if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {              if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
                 $can_setacl = 1;                  $can_setacl = 1;
Line 2638  sub handler { Line 2741  sub handler {
             if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {              if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
                 $can_delete = 1;                  $can_delete = 1;
             }              }
               if (&Apache::lonnet::allowed('rgf',$env{'request.course.id'}.'/'.$group)) {
                   $can_viewacl = 1;
               }
         }          }
     } else {      } else {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom();
         $portfolio_root = &get_portfolio_root();          $portfolio_root = &get_portfolio_root();
         $title = &mt('My Space');          $title = 'My Space';
         $can_modify = 1;          $can_modify = 1;
         $can_delete = 1;          $can_delete = 1;
         $can_upload = 1;          $can_upload = 1;
         $can_setacl = 1;          if (&Apache::lonnet::usertools_access('','','portaccess',
                                                 undef,'tools')) {
               $can_viewacl = 1;
               $can_setacl = 1;
           }
     }      }
   
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
Line 2656  sub handler { Line 2766  sub handler {
     # Give the LON-CAPA page header      # Give the LON-CAPA page header
     my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];      my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
   
       my $js = '<script type="text/javascript"
                   src="/res/adm/includes/file_upload.js"></script>';
       
     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, $js,
  {'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', $js,
                                                  {'no_nav_bar'  => 1, }));                                                   {'no_nav_bar'  => 1, }));
     } elsif ($caller eq 'coursegrp_portfolio') {      } elsif ($caller eq 'coursegrp_portfolio') {
         $r->print(&Apache::loncommon::start_page($title));          $r->print(&Apache::loncommon::start_page($title, $js));
     } else {      } else {
         $r->print(&Apache::loncommon::start_page($title,undef,          $r->print(&Apache::loncommon::start_page($title, $js,
                                                  {'bread_crumbs' => $brcrum}));                                                   {'bread_crumbs' => $brcrum}));
         if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {          if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
             $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.              $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
Line 2679  sub handler { Line 2792  sub handler {
     }      }
     $r->rflush();      $r->rflush();
     # Check if access to portfolio is blocked by one or more blocking events in courses.      # Check if access to portfolio is blocked by one or more blocking events in courses.
       my $clientip = &Apache::lonnet::get_requestor_ip($r);
     my ($blocked,$blocktext) =       my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);          &Apache::loncommon::blocking_status('port',$clientip,$uname,$udom);
     if ($blocked) {      if ($blocked) {
         my $evade_block;          my $evade_block;
         # If portfolio display is in a window popped up from a "Select Portfolio Files"          # If portfolio display is in a window popped up from a "Select Portfolio Files"
Line 2715  sub handler { Line 2829  sub handler {
             return OK;              return OK;
         }          }
     }      }
       if (($env{'form.currentpath'}) && ($env{'form.currentpath'} ne '/')) {
           my $clean_currentpath = '/'.&Apache::loncommon::clean_path($env{'form.currentpath'}).'/';
           unless ($env{'form.currentpath'} eq $clean_currentpath) {
               &invalid_parms($r,$url);
               $r->print(&Apache::loncommon::end_page());
               return OK;
           }
       }
       if ($env{'form.container'}) {
           unless (&valid_container($uname,$udom,$group)) {
               &invalid_parms($r,$url,$env{'form.currentpath'});
               $r->print(&Apache::loncommon::end_page());
               return OK;
           }
       }
     if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){      if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
     $r->print(      $r->print(
             '<p><span class="LC_warning">'              '<p><span class="LC_warning">'
Line 2727  sub handler { Line 2856  sub handler {
     }      }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print(&mt('Edit the meta data').'<br />');          $r->print(&mt('Edit Metadata').'<br />');
         &close_form($r,$url);          &close_form($r,$url);
     }      }
     if ($env{'form.uploaddoc.filename'}) {      if ($env{'form.uploaddoc.filename'}) {
Line 2808  sub handler { Line 2937  sub handler {
         }          }
     } elsif ($env{'form.access'}) {      } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};          $env{'form.selectfile'} = $env{'form.access'};
         if (!defined($env{'form.action'})) {           if (!defined($env{'form.action'})) {
             $env{'form.action'} = 'chgaccess';              $env{'form.action'} = 'chgaccess';
         }          }
         &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});          if (($can_viewacl) || ($can_setacl)) {
               &display_access($r,$url,$group,$can_setacl,$can_viewacl,$port_path,$env{'form.action'});
           } else {
               &missing_priv($r,$url,'viewacl');
           }
     } elsif (($env{'form.action'} eq 'chgaccess') ||       } elsif (($env{'form.action'} eq 'chgaccess') || 
              ($env{'form.action'} eq 'chgconditions')) {               ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {          if ($can_setacl) {
Line 2885  sub handler { Line 3018  sub handler {
  &display_common($r,$url,$current_path,$is_empty,$dirlistref,   &display_common($r,$url,$current_path,$is_empty,$dirlistref,
  $can_upload,$group);   $can_upload,$group);
         &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,          &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);                             $can_upload,$can_modify,$can_delete,$can_setacl,
                              $can_viewacl);
     }      }
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
     return OK;      return OK;

Removed from v.1.245  
changed lines
  Added in v.1.268


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