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

version 1.121.2.1, 2006/06/27 15:38:08 version 1.124, 2006/06/28 19:52:43
Line 219  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 246  sub display_directory { Line 246  sub display_directory {
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
     $r->print('<tr class="'.$css_class.'">');  
     $r->print($line);  
                 }                  }
                 my $curr_access;   $r->print('<tr class="'.$css_class.'">');
                 my $pub_access = 0;   $r->print($line);
                 my $guest_access = 0;   my $curr_access;
                 my $cond_access = 0;   if ($select_mode ne 'true') {
                 foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {      my $pub_access = 0;
                     my ($num,$scope,$end,$start) = &unpack_acc_key($key);      my $guest_access = 0;
                     if (($now > $start) && (!$end || $end > $now)) {      my $cond_access = 0;
                         if ($scope eq 'public')  {      foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
                             $pub_access = 1;   my ($num,$scope,$end,$start) = &unpack_acc_key($key);
                         } elsif ($scope eq 'guest') {   if (($now > $start) && (!$end || $end > $now)) {
                             $guest_access = 1;      if ($scope eq 'public')  {
                         } else {   $pub_access = 1;
                             $cond_access = 1;      } elsif ($scope eq 'guest') {
                         }   $guest_access = 1;
                     }      } else {
                 }   $cond_access = 1;
                 if (!$pub_access && !$guest_access && !$cond_access) {      }
                     $curr_access = &mt('Private');   }
                 } else {      }
                     my @allaccesses;       if (!$pub_access && !$guest_access && !$cond_access) {
                     if ($pub_access) {   $curr_access = &mt('Private');
                         push(@allaccesses,&mt('Public'));      } else {
                     }   my @allaccesses; 
                     if ($guest_access) {   if ($pub_access) {
                         push(@allaccesses,&mt('Passphrase-protected'));      push(@allaccesses,&mt('Public'));
                     }   }
                     if ($cond_access) {   if ($guest_access) {
                         push(@allaccesses,&mt('Conditional'));      push(@allaccesses,&mt('Passphrase-protected'));
                     }   }
                     $curr_access = join('+ ',@allaccesses);   if ($cond_access) {
                 }      push(@allaccesses,&mt('Conditional'));
                 $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');   }
                 $r->print('<td><a href="'.$href_location.$filename.'">'.   $curr_access = join('+ ',@allaccesses);
     $filename.'</a></td>');       }
                 $r->print('<td>'.$size.'</td>');   }
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');   $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
                 $r->print('<td><span style="white-space: nowrap">'.   $r->print('<td><a href="'.$href_location.$filename.'">'.
                           &mt($curr_access).'&nbsp;&nbsp;&nbsp;');    $filename.'</a></td>'); 
                 $r->print('<a href="'.$url.'?access='.$filename.   $r->print('<td>'.$size.'</td>');
                               '&amp;currentpath='.$current_path.$groupecho.   $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                               '">'.$access_admin_text.'</a>');   if ($select_mode ne 'true') {
                 $r->print('</span></td></tr>');      $r->print('<td><span style="white-space: nowrap">'.
         &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 526  sub display_access { Line 530  sub display_access {
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);      my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';      my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     my $info .=       my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
  &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').  
  '<br /><ul><li>'.  
  &mt('Public files are available to anyone without the need for login.').  
  '</li><li>'.  
  &mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').  
  '</li>'.  
  #'<li>'.  
  #&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').  
  #'<br />'.  
  #&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').  
  #'<br />'.  
  #&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').  
  '</li></ul>';  
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
Line 986  sub access_setting_table { Line 977  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
       $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
     #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');      &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
     #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);      $r->print('</td><td>&nbsp;</td><td valign="top">');
     #$r->print('</td><td>&nbsp;</td><td valign="top">');      &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
     #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
     #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('<td colspan="3" valign="top">');
     #    $r->print('<td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td valign="top">');
     #    $r->print('<td valign="top">');      }
     #}      &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
     #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);      $r->print('</td>');
     #$r->print('</td>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
     #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td>&nbsp;</td><td valign="top">');
     #    $r->print('<td>&nbsp;</td><td valign="top">');      }
     #}      &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);  
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
Removed from v.1.121.2.1  
changed lines
  Added in v.1.124

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