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

Diff for /loncom/interface/portfolio.pm between versions 1.254.2.2.2.1 and 1.267

version 1.254.2.2.2.1, 2017/11/01 02:50:05 version 1.267, 2023/12/28 15:57:27
Line 112  sub display_common { Line 112  sub display_common {
 END  END
         }          }
   
           # 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 233  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 263  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 366  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 379  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 510  sub display_directory { Line 517  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 883  sub access_for_renamed { Line 890  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 893  sub display_access { Line 900  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 905  sub display_access { Line 914  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 course editing rights may add a 'Group Portfolio' item using the Course Editor (Collaboration tab), to provide access to viewable group portfolio files.").'<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 />';
         }          }
Line 932  sub display_access { Line 941  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 {
Line 2509  sub missing_priv { Line 2526  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 2545  sub coursegrp_portfolio_header { Line 2563  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 2598  STATE Line 2618  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 {  sub valid_container {
     my ($uname,$udom,$group) = @_;      my ($uname,$udom,$group) = @_;
     my $container_prefix;      my $container_prefix;
Line 2649  sub handler { Line 2682  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 2693  sub handler { Line 2726  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 2706  sub handler { Line 2740  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();
Line 2714  sub handler { Line 2751  sub handler {
         $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 2724  sub handler { Line 2765  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 2747  sub handler { Line 2791  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 2891  sub handler { Line 2936  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 2968  sub handler { Line 3017  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.254.2.2.2.1  
changed lines
  Added in v.1.267

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