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

Diff for /loncom/interface/portfolio.pm between versions 1.168 and 1.171

version 1.168, 2006/11/01 16:09:04 version 1.171, 2006/11/06 20:02:58
Line 244  sub display_directory { Line 244  sub display_directory {
                                                   $current_permissions,$group);                                                    $current_permissions,$group);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
     my $now = time;      my $now = time;
     if ($env{"form.mode"} eq 'selectfile'){      if ($env{"form.mode"} eq 'selectfile') {
  &select_files($r);   &select_files($r);
  $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});   $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
  $select_mode = 'true';   $select_mode = 'true';
Line 270  sub display_directory { Line 270  sub display_directory {
  $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',   $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList',
       'Using the portfolio file list'));        'Using the portfolio file list'));
         $r->print('<table id="LC_browser">'.          $r->print('<table id="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.    '<tr><th colspan="2">Actions'.
     &Apache::loncommon::help_open_topic('Portfolio FileAction').
     '</th><th>&nbsp;</th><th>&nbsp;</th><th>Name'.
   &Apache::loncommon::help_open_topic('Portfolio OpenFile').    &Apache::loncommon::help_open_topic('Portfolio OpenFile').
   '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.    '</th><th>Size</th><th>Last Modified</th><th>Current Access Status'.
   &Apache::loncommon::help_open_topic('Portfolio ShareFile').    &Apache::loncommon::help_open_topic('Portfolio ShareFile').
Line 538  sub delete { Line 540  sub delete {
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");          $r->print("The file is locked and cannot be deleted.<br />");
         $r->print(&done('Back',$url));          $r->print(&done('Back',$url));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
Line 649  sub rename { Line 651  sub rename {
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     $file_name = &prepend_group($file_name);      $file_name = &prepend_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') {
         $r->print ("The file is locked and cannot be renamed.<br />");          $r->print("The file is locked and cannot be renamed.<br />");
         $r->print(&done(undef,$url));          $r->print(&done(undef,$url));
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
Line 745  sub access_for_renamed { Line 747  sub access_for_renamed {
 }  }
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;      my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
     my ($uname,$udom) = &get_name_dom();      my ($uname,$udom) = &get_name_dom();
     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 753  sub display_access { Line 755  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 file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';      my ($header,$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.');      if ($action eq 'chgaccess') {
     $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');          $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');          $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.');
     $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 />';          $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
     $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';          $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
     $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';          $info .= '</li><li>'.&explain_conditionals();
     if ($group eq '') {          $info .= '</li></ul>';
         $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 />"));          if ($group eq '') {
               $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 />"));
           }
       } else {
           $header = '<h3>'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>'.
                     &explain_conditionals().'<br />';
     }      }
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
  $r->print ('<br/>'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));   $r->print('<br />'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
  $r->print (&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
  $r->print (&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));   $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
         &access_setting_table($r,$access_controls{$file_name});          &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
                                 $action);
         my $button_text = {          my $button_text = {
                         'continue' => &mt('Proceed'),                          'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),                          'cancel' => &mt('Back to directory listing'),
Line 784  sub display_access { Line 792  sub display_access {
     }      }
 }  }
   
   sub explain_conditionals {
       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('The conditions can include affiliation with a particular course, 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.');
   }
   
 sub view_access_settings {  sub view_access_settings {
     my ($r,$url,$access_controls,$aclcount) = @_;      my ($r,$url,$access_controls,$aclcount) = @_;
     my ($showstart,$showend);      my ($showstart,$showend);
Line 822  sub build_access_summary { Line 837  sub build_access_summary {
                       domains => 'Conditional: domain-based',                        domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',                        users => 'Conditional: user-based',
                       course => 'Conditional: course-based',                        course => 'Conditional: course-based',
                       group => 'Conditional: group-based',  
                      );                       );
     my @allscopes = ('public','guest','domains','users','course','group');      my @allscopes = ('public','guest','domains','users','course');
     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 847  sub build_access_summary { Line 861  sub build_access_summary {
                 }                  }
             }              }
             $r->print('<td>'.&mt($scope_desc{$scope}));              $r->print('<td>'.&mt($scope_desc{$scope}));
             if (($scope eq 'course') || ($scope eq 'group')) {              if ($scope eq 'course') {
                 if ($chg ne 'delete') {                  if ($chg ne 'delete') {
                     my $cid = $content->{'domain'}.'_'.$content->{'number'};                      my $cid = $content->{'domain'}.'_'.$content->{'number'};
                     my %course_description = &Apache::lonnet::coursedescription($cid);                      my %course_description = &Apache::lonnet::coursedescription($cid);
Line 859  sub build_access_summary { Line 873  sub build_access_summary {
             if ($chg ne 'delete') {              if ($chg ne 'delete') {
                 if ($scope eq 'guest') {                  if ($scope eq 'guest') {
                     $r->print(&mt('Passphrase').': '.$content->{'password'});                      $r->print(&mt('Passphrase').': '.$content->{'password'});
                 } elsif ($scope eq 'course' || $scope eq 'group') {                  } elsif ($scope eq 'course') {
                     $r->print('<table><tr>');                      $r->print('<table><tr>');
                     $r->print('<th>'.&mt('Roles').'</th><th>'.                      $r->print('<th>'.&mt('Roles').'</th><th>'.
                           &mt('Access').'</th><th>'.                            &mt('Access').'</th><th>'.
                                           &mt('Sections').'</th>');                                            &mt('Sections').'</th>');
                     if ($scope eq 'course') {                      $r->print('<th>'.&mt('Groups').'</th>');
                         $r->print('<th>'.&mt('Groups').'</th>');  
                     } else {  
                         $r->print('<th>'.&mt('Teams').'</th>');  
                     }  
                     $r->print('</tr>');                      $r->print('</tr>');
                     foreach my $id (sort(keys(%{$content->{'roles'}}))) {                      foreach my $id (sort(keys(%{$content->{'roles'}}))) {
                         $r->print('<tr>');                          $r->print('<tr>');
Line 892  sub build_access_summary { Line 902  sub build_access_summary {
                             } else {                              } else {
                                 $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));                                  $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
                             }                              }
                             $r->print('</tr>');                              $r->print('</td>');
                         }                          }
  $r->print("</table>");   $r->print('</tr>');
                     }                      }
     $r->print("</tr></table>");      $r->print('</table>');
                 } elsif ($scope eq 'domains') {                  } elsif ($scope eq 'domains') {
                     $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));                      $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
                 } elsif ($scope eq 'users') {                  } elsif ($scope eq 'users') {
Line 1010  sub update_access { Line 1020  sub update_access {
     my $totalnew = 0;      my $totalnew = 0;
     my $status = 'new';      my $status = 'new';
     my ($firstitem,$lastitem);      my ($firstitem,$lastitem);
     foreach my $newitem ('course','group','domains','users') {      foreach my $newitem ('course','domains','users') {
         $allnew += $env{'form.new'.$newitem};          $allnew += $env{'form.new'.$newitem};
     }      }
     if ($allnew > 0) {      if ($allnew > 0) {
         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);
         foreach my $newitem ('course','group','domains','users') {          foreach my $newitem ('course','domains','users') {
             if ($env{'form.new'.$newitem} > 0) {              if ($env{'form.new'.$newitem} > 0) {
                 $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');                  $r->print('<br />'.&mt('Add new <b>[_1]-based</b> access control for portfolio file: <b>[_2]</b>',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'<br /><br />');
                 $firstitem = $totalnew;                  $firstitem = $totalnew;
Line 1056  sub build_access_record { Line 1066  sub build_access_record {
   
     if ($scope eq 'guest') {      if ($scope eq 'guest') {
         $record->{'password'} = $env{'form.password'};          $record->{'password'} = $env{'form.password'};
     } elsif (($scope eq 'course') || ($scope eq 'group')) {      } elsif ($scope eq 'course') {
         $record->{'domain'} = $env{'form.crsdom_'.$num};          $record->{'domain'} = $env{'form.crsdom_'.$num};
  $record->{'number'} = $env{'form.crsnum_'.$num};   $record->{'number'} = $env{'form.crsnum_'.$num};
         my @role_ids;          my @role_ids;
Line 1138  sub sort_users { Line 1148  sub sort_users {
 }  }
   
 sub access_setting_table {  sub access_setting_table {
     my ($r,$access_controls) = @_;      my ($r,$url,$filename,$access_controls,$action) = @_;
     my ($public,$publictext);      my ($public,$publictext);
     $publictext = &mt('Off');      $publictext ='Off';
     my ($guest,$guesttext);      my ($guest,$guesttext);
     $guesttext = &mt('Off');      $guesttext = 'Off';
     my @courses = ();      my @courses = ();
     my @groups = ();  
     my @domains = ();      my @domains = ();
     my @users = ();      my @users = ();
     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);
     my (%acl_count,%end,%start);      my (%acl_count,%end,%start,%conditionals);
     foreach my $key (sort(keys(%{$access_controls}))) {      foreach my $key (sort(keys(%{$access_controls}))) {
         ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);          ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
         if ($scope eq 'public') {          if ($scope eq 'public') {
Line 1161  sub access_setting_table { Line 1170  sub access_setting_table {
             $guest=$key;              $guest=$key;
             $guestnum = $num;                $guestnum = $num;  
             $guesttext = &acl_status($start{$key},$end{$key},$now);              $guesttext = &acl_status($start{$key},$end{$key},$now);
         } elsif ($scope eq 'course') {          } else {
             push(@courses,$key);              $conditionals{$scope}{$key} = $$access_controls{$key};
         } elsif ($scope eq 'group') {              if ($scope eq 'course') {
             push(@groups,$key);                  push(@courses,$key);
         } elsif ($scope eq 'domains') {              } elsif ($scope eq 'domains') {
             push(@domains,$key);                  push(@domains,$key);
         } elsif ($scope eq 'users') {              } elsif ($scope eq 'users') {
             push(@users,$key);                  push(@users,$key);
               }
         }          }
         $acl_count{$scope} ++;          $acl_count{$scope} ++;
     }      }
     $r->print('<table border="0"><tr><td valign="top">');      $r->print('<table border="0"><tr><td valign="top">');
     $r->print('<h3>'.&mt('Public access:').' '.$publictext.'</h3>');      if ($action eq 'chgaccess') {
           &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
                              \%end,$public,$publicnum,$publictext,$guest,$guestnum,
                              $guesttext,$access_controls,%conditionals);
       } else {
           &condition_setting($r,$access_controls,$now,$then,\%acl_count,
                              \@domains,\@users,\@courses);
       }
       $r->print('</td></tr></table>');
   }
   
   sub standard_settings {
       my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
         $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
       $r->print('<h3>'.&mt('Public access: [_1]',$publictext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').'</th>');
Line 1181  sub access_setting_table { Line 1205  sub access_setting_table {
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
     if ($public) {      if ($public) {
         $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.          $r->print('<td>'.&actionbox('old',$publicnum,'public').'</td><td>'.
                   &dateboxes($publicnum,$start{$public},$end{$public}).'</td>');               &dateboxes($publicnum,$start->{$public},$end->{$public}).'</td>');
     } else {      } else {
         $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.          $r->print('<td>'.&actionbox('new','0','public').'</td><td>'.
                   &dateboxes('0',$now,$then).'</td>');                    &dateboxes('0',$now,$then).'</td>');
Line 1189  sub access_setting_table { Line 1213  sub access_setting_table {
     $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><td width="40">&nbsp;</td><td valign="top">');      $r->print('</td><td width="40">&nbsp;</td><td valign="top">');
     $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>');      $r->print('<h3>'.&mt('Passphrase-protected access: [_1]',$guesttext).'</h3>');
     $r->print(&Apache::loncommon::start_data_table());      $r->print(&Apache::loncommon::start_data_table());
     $r->print(&Apache::loncommon::start_data_table_header_row());      $r->print(&Apache::loncommon::start_data_table_header_row());
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
Line 1200  sub access_setting_table { Line 1224  sub access_setting_table {
     if ($guest) {      if ($guest) {
         $passwd = $$access_controls{$guest}{'password'};          $passwd = $$access_controls{$guest}{'password'};
         $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.          $r->print('<td>'.&actionbox('old',$guestnum,'guest').'</td><td>'.
                   &dateboxes($guestnum,$start{$guest},$end{$guest}).'</td>');                &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'</td>');
     } else {      } else {
         $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.          $r->print('<td>'.&actionbox('new','1','guest').'</td><td>'.
                   &dateboxes('1',$now,$then).'</td>');                    &dateboxes('1',$now,$then).'</td>');
Line 1209  sub access_setting_table { Line 1233  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>'.
     &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);                '<tr><td colspan="3">');
       my $numconditionals = 0;
       my $conditionstext;
       my %cond_status;
       foreach my $scope ('domains','users','course') {
           $numconditionals += $acl_count->{$scope}; 
           if ($acl_count->{$scope} > 0) {
               if ($conditionstext ne 'Active') { 
                   foreach my $key (keys(%{$conditionals{$scope}})) {
                       $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
                       if ($conditionstext eq 'Active') {
                          last;
                       }
                   }
               }
           }
       }
       if ($conditionstext eq '') {
           $conditionstext = 'Off';
       }
       my %anchor_fields = (
               'access' => $env{'form.selectfile'},
               'action' => 'chgconditions',
               'currentpath' => $env{'form.currentpath'},
           );
       $r->print('<h3>'.&mt('Conditional access: [_1]',$conditionstext).'</h3>');
       if ($numconditionals > 0) {
           my $count = 1;
           my $chg = 'none';
           $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'<br /><br />');
           $r->print(&Apache::loncommon::start_data_table());
           $r->print(&Apache::loncommon::start_data_table_header_row());
           $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
                     '</th><th>'.&mt('Additional information').'</th>');
           $r->print(&Apache::loncommon::end_data_table_header_row());
           &build_access_summary($r,$count,$chg,%conditionals);
           $r->print(&Apache::loncommon::end_data_table());
       } else {
           $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
       }
   }
   
   sub condition_setting {
       my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
       $r->print('<tr><td valign="top">');
       &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 ($acl_count->{course} > 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) {  
         $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');  
     } else {  
         $r->print('<td>&nbsp;</td><td valign="top">');  
     }  
     &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);  
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
 sub acl_status {  sub acl_status {
     my ($start,$end,$now) = @_;      my ($start,$end,$now) = @_;
     if ($start > $now) {      if ($start > $now) {
         return &mt('Inactive');          return 'Inactive';
     }      }
     if ($end && $end<$now) {      if ($end && $end<$now) {
         return &mt('Inactive');          return 'Inactive';
     }      }
     return &mt('Active');      return 'Active';
 }  }
   
 sub access_element {  sub access_element {
Line 1273  sub display_access_row { Line 1336  sub display_access_row {
         $r->print(&Apache::loncommon::start_data_table_header_row());          $r->print(&Apache::loncommon::start_data_table_header_row());
         $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.          $r->print('<th>'.&mt('Action?').'</th><th>'.&mt($uctype).'</th><th>'.
               &mt('Dates available').'</th>');                &mt('Dates available').'</th>');
         if (($type eq 'course') || ($type eq 'group')) {          if ($type eq 'course') {
             $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).              $r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
                       '</th>');                        '</th>');
             $colspan ++;              $colspan ++;
Line 1283  sub display_access_row { Line 1346  sub display_access_row {
         $r->print(&Apache::loncommon::end_data_table_header_row());          $r->print(&Apache::loncommon::end_data_table_header_row());
         foreach my $key (@{$items}) {          foreach my $key (@{$items}) {
     $r->print(&Apache::loncommon::start_data_table_row());      $r->print(&Apache::loncommon::start_data_table_row());
             if (($type eq 'course') || ($type eq 'group')) {              if ($type eq 'course') {
                 &course_row($r,$status,$type,$key,$access_controls,$now,$then);                  &course_row($r,$status,$type,$key,$access_controls,$now,$then);
             } elsif ($type eq 'domains') {              } elsif ($type eq 'domains') {
                 &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,                  &domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
Line 1360  sub course_row { Line 1423  sub course_row {
     }      }
     my $js = &Apache::loncommon::coursebrowser_javascript($defdom)      my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
  .&course_js();   .&course_js();
     my $crsgrptext = 'Groups';  
     if ($type eq 'group') {  
         $crsgrptext = 'Teams';  
     }  
     my $uctype = $type;      my $uctype = $type;
     $uctype =~ s/^(\w)/uc($1)/e;      $uctype =~ s/^(\w)/uc($1)/e;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,      my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
Line 1380  sub course_row { Line 1439  sub course_row {
     $r->print('<td><table><tr>');      $r->print('<td><table><tr>');
     $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.      $r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.
               &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.                &mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.
               &mt($crsgrptext).'</th></tr>');                &mt('Groups').'</th></tr>');
     if ($status eq 'old') {      if ($status eq 'old') {
         my $max_id = 0;          my $max_id = 0;
         foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {          foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
Line 1450  sub actionbox { Line 1509  sub actionbox {
     my ($status,$num,$scope) = @_;      my ($status,$num,$scope) = @_;
     my $output = '<span style="white-space: nowrap"><label>';      my $output = '<span style="white-space: nowrap"><label>';
     if ($status eq 'new') {      if ($status eq 'new') {
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" />'.          my $checkstate;
           if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
               $checkstate = 'checked="checked"';
           }
           $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
                      $checkstate.'  />'.
         &mt('Activate');          &mt('Activate');
     } else {      } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.          $output .= '<input type="checkbox" name="delete" value="'.$num.
Line 1578  sub role_options_window { Line 1642  sub role_options_window {
     my $cnum = $env{'form.cnum'};      my $cnum = $env{'form.cnum'};
     my $type = $env{'form.type'};      my $type = $env{'form.type'};
     my $addindex = $env{'form.setroles'};      my $addindex = $env{'form.setroles'};
     my $grouptitle = 'Groups';  
     if ($type eq 'Group') {  
          $grouptitle = 'Teams';  
     }   
     my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');      my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');
     $r->print(<<"END_SCRIPT");      $r->print(<<"END_SCRIPT");
 <script type="text/javascript">  <script type="text/javascript">
Line 1602  function setRoles() { Line 1662  function setRoles() {
 </script>  </script>
 END_SCRIPT  END_SCRIPT
     $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));      $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
     $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');      $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
     return;      return;
 }  }
   
Line 2088  sub handler { Line 2148  sub handler {
         }          }
     } elsif ($env{'form.access'}) {      } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};          $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';          if (!defined($env{'form.action'})) { 
         &display_access($r,$url,$group,$can_setacl,$port_path);              $env{'form.action'} = 'chgaccess';
     } elsif ($env{'form.action'} eq 'chgaccess') {          }
           &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
       } elsif (($env{'form.action'} eq 'chgaccess') || 
                ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {          if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);              &update_access($r,$url,$group,$port_path);
         } else {          } else {
Removed from v.1.168  
changed lines
  Added in v.1.171

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