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

version 1.254.2.3, 2018/09/14 21:01:02 version 1.258, 2017/05/19 23:41:28
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="flUpload" />'
                    .'<input type="hidden" id="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 366  sub display_directory { Line 370  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 383  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 2598  STATE Line 2602  STATE
     return $state;      return $state;
 }  }
   
 sub valid_container {  # Find space available in a user's portfolio (convert to bytes)
     my ($uname,$udom,$group) = @_;  sub free_space {
     my $container_prefix;      my ($group) = @_;
     if ($group ne '') {      my $disk_quota = &get_quota($group); # Expressed in kB
         $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio";      my ($uname,$udom) = &get_name_dom($group);
     } else {      my $portfolio_root = &get_portfolio_root();
         $container_prefix = "/uploaded/$udom/$uname/portfolio";      my $getpropath = 1;
     }      my $current_disk_usage = &Apache::lonnet::diskusage($udom, $uname,
     if ($env{'form.currentpath'}) {                               $portfolio_root, $getpropath); # Expressed in kB
         $container_prefix .= $env{'form.currentpath'};      my $free_space = 1024 * ($disk_quota - $current_disk_usage);
     } else {      return $free_space;
         $container_prefix .= '/';  
     }  
     if ($env{'form.container'} =~ m{^\Q$container_prefix\E(.+)$}) {  
         my $filename = $1;  
         if ($filename eq &Apache::lonnet::clean_filename($filename)) {  
             return 1;  
         }  
     }  
     return;  
 }  
   
 sub invalid_parms {  
     my ($r,$url,$currentpath) = @_;  
     my $escpath = &HTML::Entities::encode($currentpath,'&<>"');  
     my $rtnlink = '<a href="'.$url;  
     if ($url =~ /\?/) {  
         $rtnlink .= '&';  
     } else {  
         $rtnlink .= '?';  
     }  
     $rtnlink .= 'currentpath='.$escpath;  
     $rtnlink .= '">'.&mt('Return to directory').'</a>';  
     $r->print('<h3>'.&mt('Action disallowed').'</h3>');  
     $r->print(&mt('Some of the data included with this request were invalid'));  
     $r->print('<br />'.$rtnlink);  
     return;  
 }  }
   
 sub handler {  sub handler {
Line 2724  sub handler { Line 2702  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 2782  sub handler { Line 2763  sub handler {
             $r->print(&Apache::loncommon::end_page());              $r->print(&Apache::loncommon::end_page());
             return OK;              return OK;
         }          }
     }  
     if (($env{'form.currentpath'}) && ($env{'form.currentpath'} ne '/')) {  
         my $clean_currentpath = '/'.&Apache::loncommon::clean_path($env{'form.currentpath'}).'/';  
         unless ($env{'form.currentpath'} eq $clean_currentpath) {  
             &invalid_parms($r,$url);  
             $r->print(&Apache::loncommon::end_page());  
             return OK;  
         }  
     }  
     if ($env{'form.container'}) {  
         unless (&valid_container($uname,$udom,$group)) {  
             &invalid_parms($r,$url,$env{'form.currentpath'});  
             $r->print(&Apache::loncommon::end_page());  
             return OK;  
         }  
     }      }
     if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){      if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
     $r->print(      $r->print(
Removed from v.1.254.2.3  
changed lines
  Added in v.1.258

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