--- loncom/interface/portfolio.pm 2006/07/19 21:59:10 1.121.2.8 +++ loncom/interface/portfolio.pm 2006/07/19 14:57:18 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.121.2.8 2006/07/19 21:59:10 albertel Exp $ +# $Id: portfolio.pm,v 1.137 2006/07/19 14:57:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,7 +43,7 @@ use LONCAPA; sub group_args { my $output; if (defined($env{'form.group'})) { - $output .= '&group='.$env{'form.group'}; + $ouput .= '&group='.$env{'form.group'}; if (defined($env{'form.ref'})) { $output .= '&ref='.$env{'form.ref'}; } @@ -54,13 +54,12 @@ sub group_args { sub group_form_data { my $output; if (defined($env{'form.group'})) { - $output = ''; + $ouput = ''; if (exists($env{'form.ref'})) { $output .= ''; } } - return $output; } # receives a file name and path stub from username/userfiles/portfolio/ @@ -70,16 +69,15 @@ sub make_anchor { $continue_select) = @_; if ($continue_select ne 'true') {$continue_select = 'false'}; my $anchor = ''.$filename.''; return $anchor; } - my $dirptr=16384; sub display_common { my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_; - my $namespace = &get_namespace(); - my $port_path = &get_port_path(); + my $namespace = &get_namespace($group); + my $port_path = &get_port_path($group); if ($can_upload) { my $groupitem = &group_form_data(); @@ -146,15 +144,37 @@ TABLE $r->print(""); } +sub display_directory_line { + my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, + $line, $access_controls, $curr_access, $now, $version_flag, + $href_location, $url, $current_path, $access_admin_text)=@_; + # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + $r->print(''); + $r->print($line); + $r->print(''); + $r->print(''.$$version_flag{$filename}.''. + $filename.''); + $r->print(''.$size.''); + $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); + if ($select_mode ne 'true') { + $r->print(''. + &mt($curr_access).'   '); + $r->print(''.$access_admin_text.''); + } + $r->print(''.$/); +} + sub display_directory { - my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, + my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload, $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $display_out; my $select_mode; my $checked_files; - my $port_path = &get_port_path(); - my ($uname,$udom) = &get_name_dom(); + my $port_path = &get_port_path($group); + my ($uname,$udom) = &get_name_dom($group); my $access_admin_text = &mt('View Status'); if ($can_setacl) { $access_admin_text = &mt('View/Change Status'); @@ -197,6 +217,7 @@ sub display_directory { my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; my @dir_lines; + my @version_lines; my %versioned; foreach my $line (sort { @@ -210,14 +231,30 @@ sub display_directory { $filename =~ s/\s+$//; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if ($version) { - $versioned{$fname} .= $version.","; + push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); + $versioned{$fname.'.'.$extension} .= $version.","; + } else { + push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); } - push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); } foreach my $line (@dir_lines) { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { + my %version_flag; + my $show_versions; + if ($env{'form.showversions'} eq $filename) { + $show_versions = 'true'; + } + if (exists($versioned{$filename})) { + if ($show_versions) { + $version_flag{$filename} = ''.&mt('opened folder').''; + } else { + $version_flag{$filename} = ''.&mt('closed folder').''; + } + } else { + $version_flag{$filename} = ''; + } if ($dirptr&$testdir) { my $colspan='colspan="2"'; if ($select_mode eq 'true'){ @@ -225,19 +262,13 @@ sub display_directory { } $r->print(''.&mt('closed folder').''); $r->print('Go to ...'); - $r->print(''.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).''); + $r->print(''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/'); $r->print(''); } else { my $css_class = 'LC_browser_file'; my $line; - my $version_flag; - if (exists($versioned{$fname})) { - $version_flag = "*"; - } else { - $version_flag = ""; - } - my $fullpath = $current_path.$filename; - $fullpath = &prepend_group($fullpath); + my $fullpath = $current_path.$filename; + $fullpath = &prepend_group($fullpath,$group); if ($select_mode eq 'true') { $line=''; $line .= 'Rename'; - $line .= ''.$cat.''; + $line .= ''.$version_flag{$filename}.''.$cat.''; } $line .= ''; } } - $r->print(''); - $r->print($line); my $curr_access; if ($select_mode ne 'true') { my $pub_access = 0; @@ -301,19 +330,28 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - $r->print(''); - $r->print(''. - $filename.''); - $r->print(''.$size.''); - $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); - if ($select_mode ne 'true') { - $r->print(''. - &mt($curr_access).'   '); - $r->print(''.$access_admin_text.''); + &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access, + $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text); +# $r->print(''); +# $r->print($line); +# $r->print(''); +# $r->print(''.$version_flag{$filename}.''. +# $filename.''); +# $r->print(''.$size.''); +# $r->print(''.&Apache::lonlocal::locallocaltime($mtime).''); +# if ($select_mode ne 'true') { +# $r->print(''. +# &mt($curr_access).'   '); +# $r->print(''.$access_admin_text.''); +# } +# $r->print(''.$/); + if ($show_versions) { + &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, + $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text); + } - $r->print(''.$/); } } } @@ -362,7 +400,7 @@ sub close_form { 'cancel' => &mt('Cancel'), }; } - $r->print('

'); + $r->print('

') $r->print(&group_form_data().'

'); $r->print('

@@ -409,12 +447,12 @@ sub done { } sub delete { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my @check; my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; - $file_name = &prepend_group($file_name); + $file_name = &prepend_group($file_name,$group); my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { $r->print ("The file is locked and cannot be deleted.
"); $r->print(&done('Back',$url)); @@ -431,11 +469,11 @@ sub delete { } sub delete_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; - my ($uname,$udom) = &get_name_dom(); - my $port_path = &get_port_path(); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); foreach my $delete_file (@files) { $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $env{'form.currentpath'}. @@ -456,12 +494,12 @@ sub delete_dir { } sub delete_dir_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $directory_name = $env{'form.currentpath'}; $directory_name =~ s|/$||; # remove any trailing slash - my ($uname,$udom) = &get_name_dom(); - my $namespace = &get_namespace(); - my $port_path = &get_port_path(); + my ($uname,$udom) = &get_name_dom($group); + my $namespace = &get_namespace($group); + my $port_path = &get_port_path($group); my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $directory_name); @@ -485,10 +523,10 @@ sub delete_dir_confirmed { } sub rename { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $file_name = $env{'form.currentpath'}.$env{'form.rename'}; - my ($uname,$udom) = &get_name_dom(); - $file_name = &prepend_group($file_name); + my ($uname,$udom) = &get_name_dom($group); + $file_name = &prepend_group($file_name,$group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { $r->print ("The file is locked and cannot be renamed.
"); $r->print(&done(undef,$url)); @@ -501,10 +539,10 @@ sub rename { } sub rename_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); - my ($uname,$udom) = &get_name_dom(); - my $port_path = &get_port_path(); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); if ($filenewname eq '') { $r->print(''. &mt("Error: no valid filename was provided to rename to."). @@ -532,30 +570,15 @@ sub rename_confirmed { sub display_access { my ($r,$url,$group,$can_setacl,$port_path) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; - $file_name = &prepend_group($file_name); + $file_name = &prepend_group($file_name,$group); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); - my $header = '

'.&mt('Allowing others to retrieve portfolio file: [_1]', - $port_path.$env{'form.currentpath'}. - $env{'form.access'}).'

'; - 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.'). - '
'; + my $header = '

'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; + 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.').'
'; if ($can_setacl) { &open_form($r,$url); $r->print($header.$info); @@ -732,8 +755,8 @@ sub update_access { my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; $r->print('

'.&mt('Allowing others to retrieve portfolio file: [_1]', $port_path.$file_name).'

'."\n"); - $file_name = &prepend_group($file_name); - my ($uname,$udom) = &get_name_dom(); + $file_name = &prepend_group($file_name,$group); + my ($uname,$udom) = &get_name_dom($group); my ($errors,$outcome,$deloutcome,$new_values,$translation); if ($totalprocessed) { ($outcome,$deloutcome,$new_values,$translation) = @@ -804,7 +827,7 @@ sub update_access { if ($allnew > 0) { my $now = time; my $then = $now + (60*60*24*180); # six months approx. - &open_form($r,$url); + &open_form($r,$url,$group); foreach my $newitem ('course','group','domains','users') { if ($env{'form.new'.$newitem} > 0) { $r->print('
'.&mt('Add new [_1]-based access control for portfolio file: [_2]',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'

'); @@ -822,7 +845,7 @@ sub update_access { &close_form($r,$url); } else { $r->print('
'. + '&currentpath='.$env{'form.currentpath'}.$group_arg.'">'. &mt('Display all access settings for this file').''. '     '. ''); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - - #$r->print(' '); - #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); - #$r->print(' '); - #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); - #$r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(''); - #} else { - # $r->print(''); - #} - #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); - #$r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(' '); - #} else { - # $r->print(' '); - #} - #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); + $r->print(' '); + &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(''); + } else { + $r->print(''); + } + &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(' '); + } else { + $r->print(' '); + } + &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); $r->print(''); } @@ -1395,7 +1417,7 @@ END_SCRIPT } sub select_files { - my ($r) = @_; + my ($r,$group) = @_; if ($env{'form.continue'} eq 'true') { # here we update the selections for the currentpath # eventually, have to handle removing those not checked, but . . . @@ -1439,7 +1461,6 @@ ENDSMP } } } - sub upload { my ($r,$url,$group)=@_; my $fname=$env{'form.uploaddoc.filename'}; @@ -1455,20 +1476,19 @@ sub upload { } $fname=&Apache::lonnet::clean_filename($fname); - my $portfolio_root=&get_portfolio_root(); - my ($uname,$udom) = &get_name_dom(); - my $port_path = &get_port_path(); + my $portfolio_root=&get_portfolio_root($group); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); # Fixme --- Move the checking for existing file to LOND error return - my @dir_list=&get_dir_list($portfolio_root); + my @dir_list=&get_dir_list($portfolio_root,$group); my $found_file = 0; my $locked_file = 0; foreach my $line (@dir_list) { my ($file_name)=split(/\&/,$line,2); if ($file_name eq $fname){ $file_name = $env{'form.currentpath'}.$file_name; - $file_name = &prepend_group($file_name); + $file_name = &prepend_group($file_name,$group); $found_file = 1; - # FIXME I think this is incorrect, prepend_group took care of this? if (defined($group)) { $file_name = $group.'/'.$file_name; } @@ -1508,11 +1528,11 @@ sub upload { sub lock_info { my ($r,$url,$group) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($uname,$udom) = &get_name_dom($group); my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); my $file_name = $env{'form.lockinfo'}; - $file_name = &prepend_group($file_name); + $file_name = &prepend_group($file_name,$group); if (defined($file_name) && defined($$current_permissions{$file_name})) { foreach my $array_item (@{$$current_permissions{$file_name}}) { if (ref($array_item) eq 'ARRAY') { @@ -1538,19 +1558,18 @@ sub lock_info { $r->print(&done('Back',$url)); return 'ok'; } - sub createdir { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { $r->print(''. &mt("Error: no directory name was provided."). '
'); - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group)); return; } - my $portfolio_root = &get_portfolio_root(); - my @dir_list=&get_dir_list($portfolio_root); + my $portfolio_root = &get_portfolio_root($group); + my @dir_list=&get_dir_list($portfolio_root,$group); my $found_file = 0; foreach my $line (@dir_list) { my ($filename)=split(/\&/,$line,2); @@ -1562,8 +1581,8 @@ sub createdir { $r->print(''.'Unable to create a directory named '.$newdir. ' a file or directory by that name already exists.
'); } else { - my ($uname,$udom) = &get_name_dom(); - my $port_path = &get_port_path(); + my ($uname,$udom) = &get_name_dom($group); + my $port_path = &get_port_path($group); my $result=&Apache::lonnet::mkdiruserfile($uname,$udom, $port_path.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { @@ -1578,10 +1597,11 @@ sub createdir { } sub get_portfolio_root { - my ($uname,$udom) = &get_name_dom(); + my ($group) = @_; + my ($uname,$udom) = &get_name_dom($group); my $path; - if (defined($env{'form.group'})) { - $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio'; + if (defined($group)) { + $path = '/userfiles/groups/'.$group.'/portfolio'; } else { $path = '/userfiles/portfolio'; } @@ -1606,15 +1626,16 @@ sub get_group_quota { } sub get_dir_list { - my ($portfolio_root) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($portfolio_root,$group) = @_; + my ($uname,$udom) = &get_name_dom($group); return &Apache::lonnet::dirlist($env{'form.currentpath'}, $udom,$uname,$portfolio_root); } sub get_name_dom { + my ($group) = @_; my ($uname,$udom); - if (defined($env{'form.group'})) { + if (defined($group)) { $udom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $uname = $env{'course.'.$env{'request.course.id'}.'.num'}; } else { @@ -1625,26 +1646,28 @@ sub get_name_dom { } sub prepend_group { - my ($filename) = @_; - if (defined($env{'form.group'})) { - $filename = $env{'form.group'}.$filename; + my ($filename,$group) = @_; + if (defined($group)) { + $filename = $group.$filename; } return $filename; } sub get_namespace { + my ($group) = @_; my $namespace = 'portfolio'; - if (defined($env{'form.group'})) { - my ($uname,$udom) = &get_name_dom(); - $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'}; + if (defined($group)) { + my ($uname,$udom) = &get_name_dom($group); + $namespace .= '_'.$udom.'_'.$uname.'_'.$group; } return $namespace; } sub get_port_path { + my ($group) = @_; my $port_path; - if (defined($env{'form.group'})) { - $port_path = "groups/$env{'form.group'}/portfolio"; + if (defined($group)) { + $port_path = "groups/$group/portfolio"; } else { $port_path = 'portfolio'; } @@ -1652,7 +1675,7 @@ sub get_port_path { } sub missing_priv { - my ($r,$url,$priv) = @_; + my ($r,$url,$priv,$group) = @_; my $longtext = { upload => 'upload files', delete => 'delete files', @@ -1670,7 +1693,7 @@ sub missing_priv { $r->print(&mt('

Action disallowed

')); $r->print(&mt('You do not have sufficient privileges to [_1] ', $longtext->{$priv})); - if (defined($env{'form.group'})) { + if ($group) { $r->print(&mt("in the group's file repository.")); $rtnlink .= &group_args() } else { @@ -1694,7 +1717,7 @@ sub coursegrp_portfolio_header { title=>"Course Groups"}); } &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}", + ({href=>"/adm/$cdom/$cnum/$group/smppg?ref=$env{'form.ref'}", text=>"$ucgpterm: $grp_desc", title=>"Go to group's home page"}, {href=>"/adm/coursegrp_portfolio?".&group_args(), @@ -1712,7 +1735,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath','meta','lockinfo','currentfile','action', 'fieldname','mode','rename','continue','group','access','setnum', - 'cnum','cdom','type','setroles']); + 'cnum','cdom','type','setroles','showversions','ref']); my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; @@ -1731,9 +1754,9 @@ sub handler { my $view_permission = &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); $env{'form.group'} =~ s/\W//g; - $group = $env{'form.group'}; + my $group = $env{'form.group'}; if ($group) { - ($uname,$udom) = &get_name_dom(); + ($uname,$udom) = &get_name_dom($group); my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, $group); if (%curr_groups) { @@ -1742,7 +1765,7 @@ sub handler { $grp_desc = &unescape($grp_content{'description'}); if (($view_permission) || (&Apache::lonnet::allowed('rgf', $env{'request.course.id'}.'/'.$group))) { - $portfolio_root = &get_portfolio_root(); + $portfolio_root = &get_portfolio_root($group); } else { $r->print('You do not have the privileges required to access the shared files space for this group.'); $earlyout = 1; @@ -1786,7 +1809,7 @@ sub handler { $can_setacl = 1; } - my $port_path = &get_port_path(); + my $port_path = &get_port_path($group); &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -1821,45 +1844,45 @@ sub handler { if ($can_upload) { &upload($r,$url,$group); } else { - &missing_priv($r,$url,'upload'); + &missing_priv($r,$url,'upload',$group,$refarg), } } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_confirmed($r,$url); + &delete_confirmed($r,$url,$group); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group); } } elsif ($env{'form.action'} eq 'delete') { if ($can_delete) { - &delete($r,$url); + &delete($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group); } } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_dir_confirmed($r,$url); + &delete_dir_confirmed($r,$url,$group); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group); } } elsif ($env{'form.action'} eq 'deletedir') { if ($can_delete) { &delete_dir($r,$url); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group); } } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { if ($can_modify) { - &rename_confirmed($r,$url); + &rename_confirmed($r,$url,$group); } else { - &missing_priv($r,$url,'rename'); + &missing_priv($r,$url,'rename',$group); } } elsif ($env{'form.rename'}) { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; if ($can_modify) { - &rename($r,$url); + &rename($r,$url,$group); } else { - &missing_priv($r,$url,'rename'); + &missing_priv($r,$url,'rename',$group); } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; @@ -1869,19 +1892,19 @@ sub handler { if ($can_setacl) { &update_access($r,$url,$group,$port_path); } else { - &missing_priv($r,$url,'setacl'); + &missing_priv($r,$url,'setacl',$group); } } elsif ($env{'form.action'} eq 'rolepicker') { if ($can_setacl) { &role_options_window($r); } else { - &missing_priv($r,$url,'setacl'); + &missing_priv($r,$url,'setacl',$group); } } elsif ($env{'form.createdir'}) { if ($can_upload) { - &createdir($r,$url); + &createdir($r,$url,$group); } else { - &missing_priv($r,$url,'upload'); + &missing_priv($r,$url,'upload',$group); } } elsif ($env{'form.lockinfo'}) { &lock_info($r,$url,$group); @@ -1894,14 +1917,14 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc)); } - my @dir_list=&get_dir_list($portfolio_root); + my @dir_list=&get_dir_list($portfolio_root,$group); if ($dir_list[0] eq 'no_such_dir'){ # two main reasons for this: # 1) never been here, so directory structure not created # 2) back-button navigation after deleting a directory if ($current_path eq '/'){ &Apache::lonnet::mkdiruserfile($uname,$udom, - &get_port_path()); + &get_port_path($group)); } else { # some directory that snuck in get rid of the directory # from the recent pulldown, just in case @@ -1917,7 +1940,7 @@ sub handler { my $is_empty=(@dir_list == 2); &display_common($r,$url,$current_path,$is_empty,\@dir_list, $can_upload); - &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, + &display_directory($r,$url,$current_path,$is_empty,\@dir_list, $can_upload,$can_modify,$can_delete,$can_setacl); $r->print(&Apache::loncommon::end_page()); }