--- loncom/interface/portfolio.pm 2006/07/19 21:59:10 1.121.2.8 +++ loncom/interface/portfolio.pm 2006/07/19 11:43:47 1.136 @@ -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.136 2006/07/19 11:43:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,49 +40,36 @@ use Apache::lonhtmlcommon; use HTML::Entities; use LONCAPA; -sub group_args { - my $output; - if (defined($env{'form.group'})) { - $output .= '&group='.$env{'form.group'}; - if (defined($env{'form.ref'})) { - $output .= '&ref='.$env{'form.ref'}; - } - } - return $output; -} - -sub group_form_data { - my $output; - if (defined($env{'form.group'})) { - $output = ''; - if (exists($env{'form.ref'})) { - $output .= ''; - } - } - return $output; -} - # receives a file name and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { my ($url, $filename, $current_path, $current_mode, $field_name, - $continue_select) = @_; + $continue_select,$group,$refarg) = @_; 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 ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,$refarg)=@_; + my $namespace = &get_namespace($group); + my $port_path = &get_port_path($group); if ($can_upload) { - my $groupitem = &group_form_data(); - + my $groupitem; + if (defined($group)) { + $groupitem = ''; + if (exists($env{'form.ref'})) { + $groupitem .= ''; + } + } my $iconpath= $r->dir_config('lonIconsURL') . "/"; my %text=&Apache::lonlocal::texthash( 'upload' => 'Upload', @@ -129,36 +116,72 @@ sub display_common { TABLE } my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/'); + $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group,$refarg).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/'); + $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group,$refarg).'/'); } } $r->print(''); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
print('&'.$refarg); + } + } $r->print('">'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', 'this.form.submit();')); $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, $groupecho, $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, - $can_modify,$can_delete,$can_setacl)=@_; + $can_modify,$can_delete,$can_setacl,$refarg)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my ($groupitem,$groupecho); 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'); } + if ((defined($group)) && (defined($env{'request.course.id'}))) { + $groupitem = ''; + $groupecho = '&group='.$group; + if ($refarg ne '') { + $groupecho .= '&'.$refarg; + } + if (exists($env{'form.ref'})) { + $groupitem .= ''; + } + } my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); @@ -172,8 +195,7 @@ sub display_directory { $select_mode = 'true'; } if ($is_empty && ($current_path ne '/') && $can_delete) { - $display_out = '
'. - &group_form_data(). + $display_out = ''.$groupitem. ''. ''. ''. @@ -192,11 +214,13 @@ sub display_directory { $r->print(''. ''); } - $r->print("\n".&group_form_data()."\n"); - + if (defined($group)) { + $r->print("\n".$groupitem."\n"); + } 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 +234,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 +265,13 @@ sub display_directory { } $r->print(''); $r->print(''); - $r->print(''); + $r->print(''); $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.=''; $css_class= 'LC_browser_file_locked'; } else { if (!$can_modify) { @@ -260,14 +294,12 @@ sub display_directory { if ($can_modify) { my $cat=''.&mt('Catalog Information'). ''; - $line .= 'Rename'; - $line .= ''; } } - $r->print(''); - $r->print($line); my $curr_access; if ($select_mode ne 'true') { my $pub_access = 0; @@ -301,19 +333,28 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - if ($select_mode ne 'true') { - $r->print(''); + &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, $groupecho, $access_admin_text); +# $r->print(''); +# $r->print($line); +# $r->print(''); +# $r->print(''); +# $r->print(''); +# $r->print(''); +# if ($select_mode ne 'true') { +# $r->print(''); +# } +# $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, $groupecho, $access_admin_text); + } - $r->print(''.$/); } } } @@ -355,7 +396,7 @@ sub open_form { } sub close_form { - my ($r,$url,$button_text)=@_; + my ($r,$url,$group,$button_text)=@_; if (!defined($button_text)) { $button_text = { 'continue' => &mt('Continue'), @@ -363,12 +404,27 @@ sub close_form { }; } $r->print('

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

'); + if (defined($group)) { + $r->print("\n".''); + if (exists($env{'form.ref'})) { + $r->print("\n".''); + } + } + $r->print('

'); $r->print('

'. - &group_form_data()); + $env{'form.currentpath'}.'" />'); + if (defined($group)) { + $r->print("\n".''); + if (exists($env{'form.ref'})) { + $r->print("\n".''); + } + } $r->print("\n".'

'); } @@ -395,47 +451,52 @@ sub display_file { } sub done { - my ($message,$url)=@_; + my ($message,$url,$group,$refarg)=@_; unless (defined $message) { $message='Done'; } my $result = '

'.&mt($message).'

'; return $result; } sub delete { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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)); + $r->print(&done('Back',$url,$group,$refarg)); } else { if (scalar(@files)) { &open_form($r,$url); $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); - &close_form($r,$url); + &close_form($r,$url,$group); } else { $r->print("No file was checked to delete.
"); - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } } } sub delete_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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'}. @@ -445,23 +506,23 @@ sub delete_confirmed { ') while trying to delete '.&display_file(undef, $delete_file).'
'); } } - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } sub delete_dir { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; &open_form($r,$url); $r->print('

'.&mt('Delete').' '.&display_file().'?

'); - &close_form($r,$url); + &close_form($r,$url,$group); } sub delete_dir_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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); @@ -481,35 +542,35 @@ sub delete_dir_confirmed { } $env{'form.currentpath'} = $directory_name; } - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } sub rename { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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)); + $r->print(&done(undef,$url,$group,$refarg)); } else { &open_form($r,$url); $r->print('

'.&mt('Rename').' '.&display_file().' to ?

'); - &close_form($r,$url); + &close_form($r,$url,$group); } } sub rename_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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."). '
'); - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); return; } my $result= @@ -527,35 +588,20 @@ sub rename_confirmed { ''.&display_file('',$env{'form.filenewname'}).'', ''.&display_file('',$filenewname).'')); } - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } sub display_access { - my ($r,$url,$group,$can_setacl,$port_path) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_; + 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); @@ -564,18 +610,19 @@ sub display_access { 'continue' => &mt('Proceed'), 'cancel' => &mt('Back to directory listing'), }; - &close_form($r,$url,$button_text); + &close_form($r,$url,$group,$button_text); } else { $r->print($header); if ($aclcount) { $r->print($info); } - &view_access_settings($r,$url,$access_controls{$file_name},$aclcount); + &view_access_settings($r,$url,$group,$access_controls{$file_name}, + $aclcount,$refarg); } } sub view_access_settings { - my ($r,$url,$access_controls,$aclcount) = @_; + my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_; my ($showstart,$showend); my %todisplay; foreach my $key (sort(keys(%{$access_controls}))) { @@ -596,8 +643,15 @@ sub view_access_settings { } else { $r->print(&mt('No access control settings currently exist for this file.
' )); } + my $group_arg; + if ($group) { + $group_arg = '&group='.$group; + if ($refarg ne '') { + $group_arg .= '&'.$refarg; + } + } $r->print('
'.&mt('Return to directory listing').''); + $group_arg.'">'.&mt('Return to directory listing').''); return; } @@ -705,7 +759,7 @@ sub build_access_summary { sub update_access { - my ($r,$url,$group,$port_path) = @_; + my ($r,$url,$group,$port_path,$refarg) = @_; my $totalprocessed = 0; my %processing; my %title = ( @@ -732,8 +786,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 +858,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'}).'

'); @@ -819,14 +873,21 @@ sub update_access { $access_controls{$file_name},$now,$then); } } - &close_form($r,$url); + &close_form($r,$url,$group); } else { + my $group_arg; + if ($group) { + $group_arg = '&group='.$group; + if ($refarg) { + $group_arg .= '&'.$refarg; + } + } $r->print('
'. + '&currentpath='.$env{'form.currentpath'}.$group_arg.'">'. &mt('Display all access settings for this file').''. '     '. ''.&mt('Return to directory listing').''); + $group_arg.'">'.&mt('Return to directory listing').''); } return; } @@ -996,25 +1057,24 @@ sub access_setting_table { $passwd.'" />'); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - - #$r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(''); - #if (@courses > 0 || @groups > 0) { - # $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
'.&mt('closed folder').'Go to ...'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group,$refarg).'/
LockedLocked'.$cat.''; + $line .= 'Rename'; + $line .= ''.$version_flag{$filename}.''.$cat.''; } $line .= '
'. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. - &mt($curr_access).'   '); - $r->print(''.$access_admin_text.'
'.$version_flag{$filename}.''. +# $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. +# &mt($curr_access).'   '); +# $r->print(''.$access_admin_text.'
 
'); - #&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('
'); - #} else { - # $r->print(''); - #} - #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); - #$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('
'); + } else { + $r->print(''); + } + &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); + $r->print('
 
'); + } else { + $r->print(' '); + } + &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); $r->print('
'); } @@ -1395,7 +1455,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,9 +1499,8 @@ ENDSMP } } } - sub upload { - my ($r,$url,$group)=@_; + my ($r,$url,$group,$refarg)=@_; my $fname=$env{'form.uploaddoc.filename'}; my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?) my $disk_quota = 20000; # expressed in k @@ -1455,20 +1514,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; } @@ -1481,17 +1539,17 @@ sub upload { if (($current_disk_usage + $filesize) > $disk_quota){ $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes). Disk quota will be exceeded.'. '
Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.'); - $r->print(&done('Back',$url)); + $r->print(&done('Back',$url,$group,$refarg)); } elsif ($found_file){ if ($locked_file){ $r->print(''.'Unable to upload '.$fname.', a locked file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
You will be able to rename or delete existing '.$fname.' after a grade has been assigned.'); - $r->print(&done('Back',$url)); + $r->print(&done('Back',$url,$group,$refarg)); } else { $r->print(''.'Unable to upload '.$fname.', a file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'}); - $r->print(&done('Back',$url)); + $r->print(&done('Back',$url,$group,$refarg)); } } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', @@ -1499,20 +1557,20 @@ sub upload { if ($result !~ m|^/uploaded/|) { $r->print(''.'An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); - $r->print(&done('Back',$url)); + $r->print(&done('Back',$url,$group,$refarg)); } else { - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } } } sub lock_info { - my ($r,$url,$group) = @_; - my ($uname,$udom) = &get_name_dom(); + my ($r,$url,$group,$refarg) = @_; + 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') { @@ -1535,22 +1593,21 @@ sub lock_info { } } } - $r->print(&done('Back',$url)); + $r->print(&done('Back',$url,$group,$refarg)); return 'ok'; } - sub createdir { - my ($r,$url)=@_; + my ($r,$url,$group,$refarg)=@_; 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 +1619,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') { @@ -1574,14 +1631,15 @@ sub createdir { if ($newdir ne $env{'form.newdir'}) { $r->print("The new directory name was changed from:
".$env{'form.newdir'}." to $newdir "); } - $r->print(&done(undef,$url)); + $r->print(&done(undef,$url,$group,$refarg)); } sub get_portfolio_root { - my ($uname,$udom) = &get_name_dom(); - my $path; - if (defined($env{'form.group'})) { - $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio'; + my ($group) = @_; + my ($portfolio_root,$udom,$uname,$path); + ($uname,$udom) = &get_name_dom($group); + if (defined($group)) { + $path = '/userfiles/groups/'.$group.'/portfolio'; } else { $path = '/userfiles/portfolio'; } @@ -1606,15 +1664,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 +1684,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 +1713,7 @@ sub get_port_path { } sub missing_priv { - my ($r,$url,$priv) = @_; + my ($r,$url,$priv,$group,$refarg) = @_; my $longtext = { upload => 'upload files', delete => 'delete files', @@ -1670,9 +1731,12 @@ 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() + $rtnlink .= '&group='.$group; + if ($refarg ne '') { + $rtnlink .= '&'.$refarg; + } } else { $r->print(&mt('in this portfolio.')); } @@ -1683,21 +1747,21 @@ sub missing_priv { } sub coursegrp_portfolio_header { - my ($cdom,$cnum,$grp_desc)=@_; + my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_; my $gpterm = &Apache::loncommon::group_term(); my $ucgpterm = $gpterm; $ucgpterm =~ s/^(\w)/uc($1)/e; - if ($env{'form.ref'}) { + if ($refarg) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursegroups", text=>"Groups", 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?$refarg", text=>"$ucgpterm: $grp_desc", title=>"Go to group's home page"}, - {href=>"/adm/coursegrp_portfolio?".&group_args(), + {href=>"/adm/coursegrp_portfolio?group=$group&$refarg", text=>"Group Portfolio", title=>"Display group portfolio"}); my $output = &Apache::lonhtmlcommon::breadcrumbs( @@ -1712,13 +1776,13 @@ 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; $caller = $2; } - my ($can_modify,$can_delete,$can_upload,$can_setacl); + my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg); if ($caller eq 'coursegrp_portfolio') { # Needs to be in a course if (! ($env{'request.course.fn'})) { @@ -1730,10 +1794,13 @@ sub handler { my $earlyout = 0; 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'}; + $group = $env{'form.group'}; + $group =~ s/\W//g; if ($group) { - ($uname,$udom) = &get_name_dom(); + if (exists($env{'form.ref'})) { + $refarg = 'ref='.$env{'form.ref'}; + } + ($uname,$udom) = &get_name_dom($group); my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, $group); if (%curr_groups) { @@ -1742,7 +1809,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 +1853,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; @@ -1812,79 +1879,79 @@ sub handler { &open_form($r,$url); # $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'})); $r->print('Edit the meta data
'); - &close_form($r,$url); + &close_form($r,$url,$group); } if ($env{'form.store'}) { } if ($env{'form.uploaddoc.filename'}) { if ($can_upload) { - &upload($r,$url,$group); + &upload($r,$url,$group,$refarg); } 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,$refarg); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group,$refarg); } } 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,$refarg); } } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_dir_confirmed($r,$url); + &delete_dir_confirmed($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'deletedir') { if ($can_delete) { - &delete_dir($r,$url); + &delete_dir($r,$url,$group); } else { - &missing_priv($r,$url,'delete'); + &missing_priv($r,$url,'delete',$group,$refarg); } } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { if ($can_modify) { - &rename_confirmed($r,$url); + &rename_confirmed($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'rename'); + &missing_priv($r,$url,'rename',$group,$refarg); } } elsif ($env{'form.rename'}) { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; if ($can_modify) { - &rename($r,$url); + &rename($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'rename'); + &missing_priv($r,$url,'rename',$group,$refarg); } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; $env{'form.action'} = 'chgaccess'; - &display_access($r,$url,$group,$can_setacl,$port_path); + &display_access($r,$url,$group,$can_setacl,$port_path,$refarg); } elsif ($env{'form.action'} eq 'chgaccess') { if ($can_setacl) { - &update_access($r,$url,$group,$port_path); + &update_access($r,$url,$group,$port_path,$refarg); } else { - &missing_priv($r,$url,'setacl'); + &missing_priv($r,$url,'setacl',$group,$refarg); } } 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,$refarg); } } elsif ($env{'form.createdir'}) { if ($can_upload) { - &createdir($r,$url); + &createdir($r,$url,$group,$refarg); } else { - &missing_priv($r,$url,'upload'); + &missing_priv($r,$url,'upload',$group,$refarg); } } elsif ($env{'form.lockinfo'}) { - &lock_info($r,$url,$group); + &lock_info($r,$url,$group,$refarg); } else { my $current_path='/'; if ($env{'form.currentpath'}) { @@ -1892,16 +1959,17 @@ sub handler { } if ($caller eq 'coursegrp_portfolio') { &Apache::lonhtmlcommon::clear_breadcrumbs(); - $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc)); + $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc, + $refarg)); } - 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 @@ -1915,10 +1983,11 @@ sub handler { } # need to know if directory is empty so it can be removed if desired my $is_empty=(@dir_list == 2); - &display_common($r,$url,$current_path,$is_empty,\@dir_list, - $can_upload); + &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group, + $can_upload,$refarg); &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, - $can_upload,$can_modify,$can_delete,$can_setacl); + $can_upload,$can_modify,$can_delete,$can_setacl, + $refarg); $r->print(&Apache::loncommon::end_page()); } return OK;