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

version 1.121.2.6, 2006/07/19 10:26:43 version 1.124, 2006/06/28 19:52:43
Line 1 Line 1
 # The LearningOnline Network  
 # portfolio browser  
 #  
 # $Id$  
 #  
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 36  use Apache::lonfeedback; Line 31  use Apache::lonfeedback;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::longroup;  use Apache::longroup;
 use Apache::lonhtmlcommon;  
 use HTML::Entities;  use HTML::Entities;
 use LONCAPA;  use LONCAPA;
   
Line 298  sub display_directory { Line 292  sub display_directory {
       &mt($curr_access).'   ');        &mt($curr_access).'   ');
     $r->print('<a href="'.$url.'?access='.$filename.      $r->print('<a href="'.$url.'?access='.$filename.
       '&amp;currentpath='.$current_path.$groupecho.        '&amp;currentpath='.$current_path.$groupecho.
       '">'.$access_admin_text.'</a></span></td>');        '">'.$access_admin_text.'</a></span>');
  }   }
  $r->print('</tr>'.$/);   $r->print('</td></tr>'.$/);
             }              }
         }          }
     }      }
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('</table>          $r->print('</table>
             <input type="hidden" name="continue" value="true" />              <input type="hidden" name="continue" value="true">
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />              <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">
             <input type="hidden" name="mode" value="selectfile" />              <input type="hidden" name="mode" value="selectfile">
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />              <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />              <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />              <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 527  sub rename_confirmed { Line 521  sub rename_confirmed {
 }  }
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;      my ($r,$url,$group,$can_setacl) = @_;
     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,$group);      $file_name = &prepend_group($file_name,$group);
Line 535  sub display_access { Line 529  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 portfolio file: [_1]',      my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     $port_path.$env{'form.currentpath'}.      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>';
     $env{'form.access'}).'</h3>';  
     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>';  
     if ($can_setacl) {      if ($can_setacl) {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print($header.$info);          $r->print($header.$info);
Line 706  sub build_access_summary { Line 685  sub build_access_summary {
   
   
 sub update_access {  sub update_access {
     my ($r,$url,$group,$port_path) = @_;      my ($r,$url,$group) = @_;
     my $totalprocessed = 0;      my $totalprocessed = 0;
     my %processing;      my %processing;
     my %title  = (      my %title  = (
Line 732  sub update_access { Line 711  sub update_access {
     }      }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',      $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
               $port_path.$file_name).'</h3>'."\n");                $file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name,$group);      $file_name = &prepend_group($file_name,$group);
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);      my ($errors,$outcome,$deloutcome,$new_values,$translation);
Line 828  sub update_access { Line 807  sub update_access {
         }          }
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.          $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
                   '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.                    '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
                    &mt('Display all access settings for this file').'</a>'.                     &mt('Display all access settings for this file').'</a>');
                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.  
                   '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.  
                   $group_arg.'">'.&mt('Return to directory listing').'</a>');  
     }      }
     return;      return;
 }  }
Line 1001  sub access_setting_table { Line 977  sub access_setting_table {
               $passwd.'" /></td>');                $passwd.'" /></td>');
     $r->print(&Apache::loncommon::end_data_table_row());      $r->print(&Apache::loncommon::end_data_table_row());
     $r->print(&Apache::loncommon::end_data_table());      $r->print(&Apache::loncommon::end_data_table());
       $r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');
     #$r->print('</td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td valign="top">');      &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
     #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);      $r->print('</td><td>&nbsp;</td><td valign="top">');
     #$r->print('</td><td>&nbsp;</td><td valign="top">');      &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
     #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);      $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
     #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('<td colspan="3" valign="top">');
     #    $r->print('<td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td valign="top">');
     #    $r->print('<td valign="top">');      }
     #}      &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
     #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);      $r->print('</td>');
     #$r->print('</td>');      if (@courses > 0 || @groups > 0) {
     #if (@courses > 0 || @groups > 0) {          $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');
     #    $r->print('</tr><tr><td colspan="3">&nbsp;</td></tr><tr><td colspan="3" valign="top">');      } else {
     #} else {          $r->print('<td>&nbsp;</td><td valign="top">');
     #    $r->print('<td>&nbsp;</td><td valign="top">');      }
     #}      &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
     #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);  
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
 }  }
   
Line 1428  ENDSMP Line 1403  ENDSMP
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;                      fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }                  }
             }              }
             opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;              opener.document.forms.lonhomework.
   ENDSMP
       $javascript .= $env{'form.fieldname'};
       $javascript .= (<<ENDSMP);
           .value=fileList;
             self.close();              self.close();
         }          }
         </script>          </script>
Line 1449  sub upload { Line 1428  sub upload {
     my $fname=$env{'form.uploaddoc.filename'};      my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)      my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k      my $disk_quota = 20000; # expressed in k
     if (defined($group)) {  
         my $grp_quota = &get_group_quota($group); # quota expressed in k   
         if ($grp_quota ne '') {  
             $disk_quota = $grp_quota;  
         } else {  
             $disk_quota = 0;  
         }  
     }  
     $fname=&Apache::lonnet::clean_filename($fname);      $fname=&Apache::lonnet::clean_filename($fname);
   
     my $portfolio_root=&get_portfolio_root($group);      my $portfolio_root=&get_portfolio_root($group);
Line 1508  sub upload { Line 1479  sub upload {
         }          }
     }      }
 }  }
   
 sub lock_info {  sub lock_info {
     my ($r,$url,$group) = @_;      my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 1591  sub get_portfolio_root { Line 1561  sub get_portfolio_root {
     return (&Apache::loncommon::propath($udom,$uname).$path);      return (&Apache::loncommon::propath($udom,$uname).$path);
 }  }
   
 sub get_group_quota {  
     my ($group) = @_;  
     my $group_quota;   
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};  
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};  
     my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);  
     if (%curr_groups) {  
         my %group_info =  &Apache::longroup::get_group_settings(  
                                                     $curr_groups{$group});  
         $group_quota = $group_info{'quota'}; #expressed in Mb  
         if ($group_quota) {  
             $group_quota = 1000 * $group_quota; #expressed in k  
         }   
     }  
     return $group_quota;  
 }   
   
 sub get_dir_list {  sub get_dir_list {
     my ($portfolio_root,$group) = @_;      my ($portfolio_root,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 1688  sub missing_priv { Line 1641  sub missing_priv {
     return;      return;
 }  }
   
 sub coursegrp_portfolio_header {  
     my ($cdom,$cnum,$group,$grp_desc)=@_;  
     my $gpterm  = &Apache::loncommon::group_term();  
     my $ucgpterm = $gpterm;  
     $ucgpterm =~ s/^(\w)/uc($1)/e;  
     &Apache::lonhtmlcommon::add_breadcrumb  
         ({href=>"/adm/$cdom/$cnum/$group/smppg",  
           text=>"$ucgpterm: $grp_desc",  
           title=>"Go to group's home page"},  
          {href=>"//?group=$group",  
           text=>"Group Portfolio",  
           title=>"Display group portfolio"},);  
     my $output = &Apache::lonhtmlcommon::breadcrumbs(  
                          &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));  
     return $output;  
 }  
   
   
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
Line 1713  sub handler { Line 1648  sub handler {
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',           ['selectfile','currentpath','meta','lockinfo','currentfile','action',
   'fieldname','mode','rename','continue','group','access','setnum',    'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles']);            'cnum','cdom','type','setroles']);
     my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);      my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {      if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;          $url = $1.$2;
         $caller = $2;          $caller = $2;
Line 1737  sub handler { Line 1672  sub handler {
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,              my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
        $group);          $group); 
             if (%curr_groups) {              if (%curr_groups) {
                 my %grp_content = &Apache::longroup::get_group_settings(  
                                                          $curr_groups{$group});  
                 $grp_desc = &unescape($grp_content{'description'});  
                 if (($view_permission) || (&Apache::lonnet::allowed('rgf',                  if (($view_permission) || (&Apache::lonnet::allowed('rgf',
                                       $env{'request.course.id'}.'/'.$group))) {                                        $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root($group);                      $portfolio_root = &get_portfolio_root($group);
Line 1757  sub handler { Line 1689  sub handler {
             $earlyout = 1;              $earlyout = 1;
         }          }
         if ($earlyout) { return OK; }          if ($earlyout) { return OK; }
         if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {          if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
               $can_setacl = 1;
           }
           if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
               $can_upload = 1;
           }
           if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
             $can_modify = 1;              $can_modify = 1;
           }
           if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
             $can_delete = 1;              $can_delete = 1;
             $can_upload = 1;  
             $can_setacl = 1;  
         } else {  
             if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {  
                 $can_setacl = 1;  
             }  
             if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {  
                 $can_upload = 1;  
             }  
             if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {  
                 $can_modify = 1;  
             }  
             if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {  
                 $can_delete = 1;  
             }  
         }          }
     } else {      } else {
         ($uname,$udom) = &get_name_dom();          ($uname,$udom) = &get_name_dom();
Line 1786  sub handler { Line 1711  sub handler {
         $can_setacl = 1;          $can_setacl = 1;
     }      }
   
     my $port_path = &get_port_path($group);  
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Line 1864  sub handler { Line 1788  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';          $env{'form.action'} = 'chgaccess';
         &display_access($r,$url,$group,$can_setacl,$port_path);          &display_access($r,$url,$group,$can_setacl);
     } elsif ($env{'form.action'} eq 'chgaccess') {      } elsif ($env{'form.action'} eq 'chgaccess') {
         if ($can_setacl) {          if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);              &update_access($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'setacl',$group);              &missing_priv($r,$url,'setacl',$group);
         }          }
Line 1890  sub handler { Line 1814  sub handler {
  if ($env{'form.currentpath'}) {   if ($env{'form.currentpath'}) {
     $current_path = $env{'form.currentpath'};      $current_path = $env{'form.currentpath'};
  }   }
         if ($caller eq 'coursegrp_portfolio') {  
             &Apache::lonhtmlcommon::clear_breadcrumbs();  
             $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc));  
         }  
         my @dir_list=&get_dir_list($portfolio_root,$group);          my @dir_list=&get_dir_list($portfolio_root,$group);
  if ($dir_list[0] eq 'no_such_dir'){   if ($dir_list[0] eq 'no_such_dir'){
     # two main reasons for this:      # two main reasons for this:
Removed from v.1.121.2.6  
changed lines
  Added in v.1.124

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