[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.3 and 1.123

version 1.121.2.3, 2006/06/28 19:57:44 version 1.123, 2006/06/27 15:38:54
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 224  sub display_directory { Line 219  sub display_directory {
                 }                  }
                my $fullpath = $current_path.$filename;                 my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);                  $fullpath = &prepend_group($fullpath,$group);
                 if ($select_mode eq 'true') {                  if ($select_mode eq 'true'){
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';                      $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
     if ($$checked_files{$filename} eq 'selected') {      if ($$checked_files{$filename} eq 'selected') {
                         $line.=" checked ";                          $line.=" checked ";
Line 251  sub display_directory { Line 246  sub display_directory {
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
       $r->print('<tr class="'.$css_class.'">');
       $r->print($line);
                 }                  }
  $r->print('<tr class="'.$css_class.'">');                  my $curr_access;
  $r->print($line);                  my $pub_access = 0;
  my $curr_access;                  my $guest_access = 0;
  if ($select_mode ne 'true') {                  my $cond_access = 0;
     my $pub_access = 0;                  foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
     my $guest_access = 0;                      my ($num,$scope,$end,$start) = &unpack_acc_key($key);
     my $cond_access = 0;                      if (($now > $start) && (!$end || $end > $now)) {
     foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {                          if ($scope eq 'public')  {
  my ($num,$scope,$end,$start) = &unpack_acc_key($key);                              $pub_access = 1;
  if (($now > $start) && (!$end || $end > $now)) {                          } elsif ($scope eq 'guest') {
     if ($scope eq 'public')  {                              $guest_access = 1;
  $pub_access = 1;                          } else {
     } elsif ($scope eq 'guest') {                              $cond_access = 1;
  $guest_access = 1;                          }
     } else {                      }
  $cond_access = 1;                  }
     }                  if (!$pub_access && !$guest_access && !$cond_access) {
  }                      $curr_access = &mt('Private');
     }                  } else {
     if (!$pub_access && !$guest_access && !$cond_access) {                      my @allaccesses; 
  $curr_access = &mt('Private');                      if ($pub_access) {
     } else {                          push(@allaccesses,&mt('Public'));
  my @allaccesses;                       }
  if ($pub_access) {                      if ($guest_access) {
     push(@allaccesses,&mt('Public'));                          push(@allaccesses,&mt('Passphrase-protected'));
  }                      }
  if ($guest_access) {                      if ($cond_access) {
     push(@allaccesses,&mt('Passphrase-protected'));                          push(@allaccesses,&mt('Conditional'));
  }                      }
  if ($cond_access) {                      $curr_access = join('+ ',@allaccesses);
     push(@allaccesses,&mt('Conditional'));                  }
  }                  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
  $curr_access = join('+ ',@allaccesses);                  $r->print('<td><a href="'.$href_location.$filename.'">'.
     }      $filename.'</a></td>'); 
  }                  $r->print('<td>'.$size.'</td>');
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');                  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
  $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><span style="white-space: nowrap">'.
   $filename.'</a></td>');                             &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
  $r->print('<td>'.$size.'</td>');                  $r->print('<a href="'.$url.'?access='.$filename.
  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');                                '&amp;currentpath='.$current_path.$groupecho.
  if ($select_mode ne 'true') {                                '">'.$access_admin_text.'</a>');
     $r->print('<td><span style="white-space: nowrap">'.                  $r->print('</span></td></tr>');
       &mt($curr_access).'&nbsp;&nbsp;&nbsp;');  
     $r->print('<a href="'.$url.'?access='.$filename.  
       '&amp;currentpath='.$current_path.$groupecho.  
       '">'.$access_admin_text.'</a></span>');  
  }  
  $r->print('</td></tr>'.$/);  
             }              }
         }          }
     }      }
Line 535  sub display_access { Line 526  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 973  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>');
 }  }
   
Removed from v.1.121.2.3  
changed lines
  Added in v.1.123

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