--- loncom/interface/portfolio.pm	2014/12/07 19:45:19	1.255
+++ loncom/interface/portfolio.pm	2024/09/07 01:07:21	1.269
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.255 2014/12/07 19:45:19 raeburn Exp $
+# $Id: portfolio.pm,v 1.269 2024/09/07 01:07:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,13 +112,17 @@ sub display_common {
 END
         }
 
+        # Find space available before uploading
+        my $free_space = &free_space($group);
+
         # Upload File
         $r->print('<div class="LC_left_float">'
                  .'<form method="post" enctype="multipart/form-data" action="'.$escuri.'">'
                  .'<fieldset>'
                  .'<legend>'.$lt{'upload_label'}.'</legend>'
                  .$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="action" value="'.$env{"form.action"}.'" />'
                  .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
@@ -199,7 +203,8 @@ sub display_portfolio_usage {
                     .$helpitem
                     .'</div>'
                     .'<div>'
-                    .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
+                    .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
+                                                           $disk_quota,'portfolio')
                     .'</div>');
 }
 
@@ -262,13 +267,16 @@ sub display_directory_line {
 
 sub display_directory {
     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 $select_mode;
     my $checked_files;
     my $port_path = &get_port_path();
     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) {
         $access_admin_text = &mt('View/Change Status');
     }
@@ -306,6 +314,18 @@ sub display_directory {
                 &mt('Using the portfolio file list'))
            .'</p>'
         );
+        my ($acl_helpfile,$acl_helplink);
+        if ($can_setacl) {
+            $acl_helpfile = 'Portfolio ShareFile';
+        } elsif ($caller eq 'coursegrp_portfolio') {
+            $acl_helpfile = 'Portfolio ShareFile Group';
+        }
+        unless ($can_setacl || $can_viewacl) {
+            $acl_helpfile = 'Portfolio ShareFile Off';
+        }
+        if ($acl_helpfile) {
+            $acl_helplink = &Apache::loncommon::help_open_topic($acl_helpfile);
+        }
         $r->print(&Apache::loncommon::start_data_table()
                  .&Apache::loncommon::start_data_table_header_row()
                  .'<th colspan="2">'.&mt('Actions'). &Apache::loncommon::help_open_topic('Portfolio FileAction').'</th>'
@@ -315,7 +335,7 @@ sub display_directory {
                  .'<th>'.&mt('Size').'</th>'
                  .'<th>'.&mt('Last Modified').'</th>'
                  .'<th>&nbsp;</th>'
-                 .'<th>'.&mt('Current Access Status').&Apache::loncommon::help_open_topic('Portfolio ShareFile').'</th>'
+                 .'<th>'.&mt('Current Access Status').$acl_helplink.'</th>'
                  .&Apache::loncommon::end_data_table_header_row());
     }
 
@@ -482,6 +502,7 @@ sub display_directory {
 		    my $cond_access = 0;
 		    foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
 			my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+                        next if ($scope eq 'ip');   
 			if (($now > $start) && (!$end || $end > $now)) {
 			    if ($scope eq 'public')  {
 				$pub_access = 1;
@@ -509,7 +530,7 @@ sub display_directory {
 		    }
 		}
                 &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);
 		if ($show_versions) {
 		    foreach my $dir_line (@{ $versioned{$fullpath} }) {
@@ -882,7 +903,7 @@ sub access_for_renamed {
 }
 
 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 $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name);
@@ -892,6 +913,8 @@ sub display_access {
     my $aclcount = keys(%access_controls);
     my ($header,$info);
     if ($action eq 'chgaccess') {
+        my $uhome = &Apache::lonnet::homeserver($uname,$udom);
+        my $prefix = &Apache::lonnet::url_prefix($r,$udom,$uhome,'web');
         $header =
             '<h2>'
             .&mt('Allowing others to retrieve file: [_1]'
@@ -904,13 +927,13 @@ 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>'.&explain_conditionals();
         $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 '') {
             $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 {
             $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 '') {
             $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 />';
         }
@@ -931,13 +954,21 @@ sub display_access {
                         'cancel' => &mt('Return to directory'),
                       };
         &close_form($r,$url,$button_text);
-    } else {
+    } elsif ($can_viewacl) {
         $r->print($header);
         if ($aclcount) {  
             $r->print($info);
         }
         &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 {
@@ -987,9 +1018,9 @@ sub build_access_summary {
                       domains => 'Conditional: domain-based',
                       users => 'Conditional: user-based',
                       course => 'Conditional: course/community-based',
-                      ip     => 'Conditional: IP-based',
+                      userip => 'Conditional: IP-based',
                      );
-    my @allscopes = ('public','guest','domains','users','course','ip');
+    my @allscopes = ('public','guest','domains','users','course','userip');
     foreach my $scope (@allscopes) {
         if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
             next;
@@ -1066,9 +1097,9 @@ sub build_access_summary {
                 } elsif ($scope eq 'users') {
                     my $curr_user_list = &sort_users($content->{'users'});
                     $r->print(&mt('Users: ').$curr_user_list);
-                } elsif ($scope eq 'ip') {
-                    my $curr_ips_list = &sort_ips($content->{'ip'});
-                    $r->print(&mt('IP(s): ').$curr_ips_list);
+                } elsif ($scope eq 'userip') {
+                    my $curr_ips_list = &sort_ips($content->{'userip'});
+                    $r->print(&mt('IP(s):').' '.$curr_ips_list);
                 } else {
                     $r->print('&nbsp;');
                 }
@@ -1177,7 +1208,7 @@ sub update_access {
     my $totalnew = 0;
     my $status = 'new';
     my ($firstitem,$lastitem);
-    my @types = ('course','domains','users','ip');
+    my @types = ('course','domains','users','userip');
     foreach my $newitem (@types) {
         $allnew += $env{'form.new'.$newitem};
     }
@@ -1189,7 +1220,7 @@ sub update_access {
            course  => 'course/community',
            domains => 'domain',
            users   => 'user',
-           ip      => 'IP',
+           userip  => 'IP',
         );
         foreach my $newitem (@types) {
             next if ($env{'form.new'.$newitem} <= 0);
@@ -1293,7 +1324,7 @@ sub build_access_record {
 		'udom'  => $udom
 		});
 	}
-    } elsif ($scope eq 'ip') {
+    } elsif ($scope eq 'userip') {
         my $ipslist = $env{'form.ips_'.$num};
         $ipslist =~ s/\s+//sg;
         my %ipshash = map { ($_,1) } (split(/,/,$ipslist));
@@ -1364,7 +1395,7 @@ sub access_setting_table {
                 push(@domains,$key);
             } elsif ($scope eq 'users') {
                 push(@users,$key);
-            } elsif ($scope eq 'ip') {
+            } elsif ($scope eq 'userip') {
                 push(@ips,$key);
             }
         }
@@ -1426,7 +1457,7 @@ sub standard_settings {
     my $numconditionals = 0;
     my $conditionstext;
     my %cond_status;
-    foreach my $scope ('domains','users','course','ip') {
+    foreach my $scope ('domains','users','course','userip') {
         $numconditionals += $acl_count->{$scope}; 
         if ($acl_count->{$scope} > 0) {
             if ($conditionstext ne 'Active') {
@@ -1473,7 +1504,7 @@ sub condition_setting {
     $r->print('</td></tr><tr><td colspan="3"></td></tr><tr><td valign="top">');
     &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
     $r->print('</td><td>&nbsp;</td><td valign="top">');
-    &access_element($r,'ip',$acl_count,$ips,$access_controls,$now,$then);
+    &access_element($r,'userip',$acl_count,$ips,$access_controls,$now,$then);
     $r->print('</td></tr></table>');
 }
 
@@ -1494,7 +1525,7 @@ sub access_element {
         domains => 'Domain',
         users   => 'User',
         course  => 'Course/Community',
-        ip      => 'IP',
+        userip  => 'IP',
     );
     $r->print('<h3>'.&mt($typetext{$type}.'-based conditional access:').' ');
     if ($$acl_count{$type}) {
@@ -1519,7 +1550,7 @@ sub display_access_row {
     } elsif ($type eq 'users') {
         $showtype = &mt('Users');
         $infotype = 'User';
-    } elsif ($type eq 'ip') {
+    } elsif ($type eq 'userip') {
         $showtype = &mt('IP-based');
         $infotype = 'IP';  
     }
@@ -1547,7 +1578,7 @@ sub display_access_row {
                             $then);
             } elsif ($type eq 'users') {
                 &users_row($r,$status,$key,$access_controls,$now,$then);
-            } elsif ($type eq 'ip') {
+            } elsif ($type eq 'userip') {
                 &ips_row($r,$status,$key,$access_controls,$now,$then);
             }
 	    $r->print(&Apache::loncommon::end_data_table_row());
@@ -1730,11 +1761,11 @@ sub users_row {
 sub ips_row {
     my ($r,$status,$item,$access_controls,$now,$then) = @_;
     my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
-                                                    'ip');
+                                                    'userip');
     my $curr_ips_list;
     if ($status eq 'old') {
         my $content = $$access_controls{$item};
-        $curr_ips_list = &sort_ips($content->{'ip'});
+        $curr_ips_list = &sort_ips($content->{'userip'});
     }
     $r->print('<td>'.&actionbox($status,$num,$scope).'</td><td>'.&mt('Format for IP controls').'<br />'.
               &mt('[_1] or [_2] or [_3] or [_4] or [_5]','<tt>35.8.*</tt>','<tt>35.8.3.[34-56]</tt>',
@@ -1753,7 +1784,7 @@ sub additional_item {
         $showtype = 'domain';
     } elsif ($type eq 'users') {
         $showtype = 'user';
-    } elsif ($type eq 'ip') {
+    } elsif ($type eq 'userip') {
         $showtype = 'IP';
     }
     return
@@ -1767,7 +1798,7 @@ sub actionbox {
     my $output = '<span class="LC_nobreak"><label>';
     if ($status eq 'new') {
         my $checkstate;
-        if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course' || $scope eq 'ip') {
+        if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course' || $scope eq 'userip') {
             $checkstate = 'checked="checked"';
         }
         $output .= '<input type="checkbox" name="activate" value="'.$num.'" '.
@@ -2508,6 +2539,7 @@ sub missing_priv {
                       delete => 'delete files',
                       rename => 'rename files',
                       setacl => 'set access controls for files',
+                      viewacl => 'view access controls for files',
     );
     my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
     my $rtnlink = '<a href="'.$url;
@@ -2544,13 +2576,15 @@ sub coursegrp_portfolio_header {
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
-          text=>"$ucgpterm: $grp_desc",
-          title=>"Go to group's home page"},
+          text=>&mt('Group').": $grp_desc",
+          title=>&mt("Go to group's home page"),
+          no_mt=>1},
          {href=>"/adm/coursegrp_portfolio?".&group_args(),
           text=>"Group Portfolio",
           title=>"Display group portfolio"});
     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;
 }
 
@@ -2567,7 +2601,7 @@ sub get_quota {
     } else {
         $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
                                     $env{'user.domain'}); #expressed in MB
-        $disk_quota = 1000 * $disk_quota; # convert from MB to kB
+        $disk_quota = 1024 * $disk_quota; # convert from MB to kB
     }
     return $disk_quota;
 }
@@ -2597,6 +2631,58 @@ 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 {
+    my ($uname,$udom,$group) = @_;
+    my $container_prefix;
+    if ($group ne '') {
+        $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio";
+    } else {
+        $container_prefix = "/uploaded/$udom/$uname/portfolio";
+    }
+    if ($env{'form.currentpath'}) {
+        $container_prefix .= $env{'form.currentpath'};
+    } else {
+        $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 {
     # this handles file management
     my $r = shift;
@@ -2609,7 +2695,7 @@ sub handler {
         $url = $1.$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') {
     #  Needs to be in a course
         if (! ($env{'request.course.fn'})) {
@@ -2653,6 +2739,7 @@ sub handler {
             $can_delete = 1;
             $can_upload = 1;
             $can_setacl = 1;
+            $can_viewacl = 1;
         } else {
             if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
                 $can_setacl = 1;
@@ -2666,6 +2753,9 @@ sub handler {
             if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
                 $can_delete = 1;
             }
+            if (&Apache::lonnet::allowed('rgf',$env{'request.course.id'}.'/'.$group)) {
+                $can_viewacl = 1;
+            }
         }
     } else {
         ($uname,$udom) = &get_name_dom();
@@ -2674,7 +2764,11 @@ sub handler {
         $can_modify = 1;
         $can_delete = 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();
@@ -2684,16 +2778,19 @@ sub handler {
     # Give the LON-CAPA page header
     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'){
-        $r->print(&Apache::loncommon::start_page($title,undef,
+        $r->print(&Apache::loncommon::start_page($title, $js,
 						 {'only_body' => 1}));
     } 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, }));
     } elsif ($caller eq 'coursegrp_portfolio') {
-        $r->print(&Apache::loncommon::start_page($title));
+        $r->print(&Apache::loncommon::start_page($title, $js));
     } else {
-        $r->print(&Apache::loncommon::start_page($title,undef,
+        $r->print(&Apache::loncommon::start_page($title, $js,
                                                  {'bread_crumbs' => $brcrum}));
         if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
             $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
@@ -2707,8 +2804,9 @@ sub handler {
     }
     $r->rflush();
     # 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) = 
-        &Apache::loncommon::blocking_status('port',$uname,$udom);
+        &Apache::loncommon::blocking_status('port',$clientip,$uname,$udom);
     if ($blocked) {
         my $evade_block;
         # If portfolio display is in a window popped up from a "Select Portfolio Files"
@@ -2743,6 +2841,21 @@ sub handler {
             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'})){
    	$r->print(
             '<p><span class="LC_warning">'
@@ -2836,10 +2949,14 @@ sub handler {
         }
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
-        if (!defined($env{'form.action'})) { 
+        if (!defined($env{'form.action'})) {
             $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') || 
              ($env{'form.action'} eq 'chgconditions')) {
         if ($can_setacl) {
@@ -2913,7 +3030,8 @@ sub handler {
 	&display_common($r,$url,$current_path,$is_empty,$dirlistref,
 			$can_upload,$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());
     return OK;