'.
- '| Actions | | Name | Size | Last Modified | Current Access Status |
|---|
');
- }
- if (defined($group)) {
- $r->print("\n".$groupitem."\n");
+ '| Actions | | | Name | Size | Last Modified | Current Access Status |
|---|
');
}
+ $r->print("\n".&group_form_data()."\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
+ foreach my $dir_line (sort
{
my ($afile)=split('&',$a,2);
my ($bfile)=split('&',$b,2);
@@ -230,7 +248,7 @@ sub display_directory {
} (@$dir_list)) {
#$strip holds directory/file name
#$dom
- my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$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+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if ($version) {
@@ -240,8 +258,8 @@ sub display_directory {
push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
}
}
- foreach my $line (@dir_lines) {
- my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
+ foreach my $dir_line (@dir_lines) {
+ my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
my %version_flag;
@@ -250,13 +268,21 @@ sub display_directory {
$show_versions = 'true';
}
if (exists($versioned{$filename})) {
+ my %anchor_fields = (
+ 'selectfile' => $filename,
+ 'continue' => 'false',
+ 'currentpath' => $current_path,
+ );
if ($show_versions) {
- $version_flag{$filename} = '
';
+ $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ '');
} else {
- $version_flag{$filename} = '
';
+ $anchor_fields{'showversions'} = $filename;
+ $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ '');
}
} else {
- $version_flag{$filename} = '';
+ $version_flag{$filename} = ' ';
}
if ($dirptr&$testdir) {
my $colspan='colspan="2"';
@@ -265,13 +291,20 @@ sub display_directory {
}
$r->print(' | ');
$r->print('Go to ... | ');
- $r->print(''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group,$refarg).'/ | ');
+ my %anchor_fields = (
+ 'selectfile' => $filename.'/',
+ 'currentpath' => $current_path.$filename.'/',
+ 'mode' => $env{"form.mode"},
+ 'fieldname' => $env{"form.fieldname"},
+ 'continue' => $env{"form.continue"}
+ );
+ $r->print(''.$version_flag{$filename}.' | '.&make_anchor($url,\%anchor_fields,$filename.'/').' | ');
$r->print('
');
} else {
my $css_class = 'LC_browser_file';
my $line;
my $fullpath = $current_path.$filename;
- $fullpath = &prepend_group($fullpath,$group);
+ $fullpath = &prepend_group($fullpath);
if ($select_mode eq 'true') {
$line='Locked | ';
+ my %anchor_fields = (
+ 'lockinfo' => $current_path.$filename
+ );
+ $line.=''.&make_anchor($url,\%anchor_fields,'Locked').' | ';
$css_class= 'LC_browser_file_locked';
} else {
if (!$can_modify) {
@@ -292,10 +328,15 @@ sub display_directory {
$line .= '';
}
if ($can_modify) {
- my $cat='.')
';
- $line .= 'Rename';
- $line .= ''.$version_flag{$filename}.''.$cat.'';
+ my %anchor_fields = (
+ 'rename' => $filename,
+ currentpath => $current_path
+ );
+ $line .= &make_anchor($url,\%anchor_fields,'Rename');
+ $line .= ' | '.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+ # ''.$cat.'';
}
$line .= ' | ';
}
@@ -333,27 +374,20 @@ sub display_directory {
$curr_access = join('+ ',@allaccesses);
}
}
- &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(''.$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('
'.$/);
+ &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);
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);
-
+ foreach my $dir_line (@version_lines) {
+ my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
+ my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+ $line = ' | ';
+ if (($v_fname eq $fname)&&($v_extension eq $extension)) {
+ &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size,
+ $css_class, $line, \%access_controls, $curr_access, $now,
+ \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
+ }
+ }
}
}
}
@@ -396,7 +430,7 @@ sub open_form {
}
sub close_form {
- my ($r,$url,$group,$button_text)=@_;
+ my ($r,$url,$button_text)=@_;
if (!defined($button_text)) {
$button_text = {
'continue' => &mt('Continue'),
@@ -404,27 +438,12 @@ sub close_form {
};
}
$r->print('');
- if (defined($group)) {
- $r->print("\n".'');
- if (exists($env{'form.ref'})) {
- $r->print("\n".'');
- }
- }
- $r->print('
');
+ $r->print(&group_form_data().'');
$r->print('');
}
@@ -451,52 +470,47 @@ sub display_file {
}
sub done {
- my ($message,$url,$group,$refarg)=@_;
+ my ($message,$url)=@_;
unless (defined $message) {
$message='Done';
}
my $result = '';
return $result;
}
sub delete {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $file_name = &prepend_group($file_name,$group);
+ $file_name = &prepend_group($file_name);
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- my ($uname,$udom) = &get_name_dom($group);
+ my ($uname,$udom) = &get_name_dom();
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,$group,$refarg));
+ $r->print(&done('Back',$url));
} else {
if (scalar(@files)) {
&open_form($r,$url);
$r->print(''.&mt('Delete').' '.&display_file(undef,\@files).'?
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
} else {
$r->print("No file was checked to delete.
");
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
}
}
}
sub delete_confirmed {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
- my ($uname,$udom) = &get_name_dom($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
foreach my $delete_file (@files) {
$result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$env{'form.currentpath'}.
@@ -506,23 +520,23 @@ sub delete_confirmed {
') while trying to delete '.&display_file(undef, $delete_file).'
');
}
}
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
}
sub delete_dir {
- my ($r,$url,$group)=@_;
+ my ($r,$url)=@_;
&open_form($r,$url);
$r->print(''.&mt('Delete').' '.&display_file().'?
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
}
sub delete_dir_confirmed {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
- my ($uname,$udom) = &get_name_dom($group);
- my $namespace = &get_namespace($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $namespace = &get_namespace();
+ my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
@@ -542,35 +556,35 @@ sub delete_dir_confirmed {
}
$env{'form.currentpath'} = $directory_name;
}
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
}
sub rename {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
- my ($uname,$udom) = &get_name_dom($group);
- $file_name = &prepend_group($file_name,$group);
+ my ($uname,$udom) = &get_name_dom();
+ $file_name = &prepend_group($file_name);
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,$group,$refarg));
+ $r->print(&done(undef,$url));
} else {
&open_form($r,$url);
$r->print(''.&mt('Rename').' '.&display_file().' to
?
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
}
}
sub rename_confirmed {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
- my ($uname,$udom) = &get_name_dom($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
if ($filenewname eq '') {
$r->print(''.
&mt("Error: no valid filename was provided to rename to.").
'
');
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
return;
}
my $result=
@@ -588,20 +602,25 @@ sub rename_confirmed {
''.&display_file('',$env{'form.filenewname'}).'',
''.&display_file('',$filenewname).''));
}
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
}
sub display_access {
- my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_;
- my ($uname,$udom) = &get_name_dom($group);
+ my ($r,$url,$group,$can_setacl,$port_path) = @_;
+ my ($uname,$udom) = &get_name_dom();
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
- $file_name = &prepend_group($file_name,$group);
+ $file_name = &prepend_group($file_name);
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 $header = ''.&mt('Allowing others to retrieve 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.').'
- '.&mt('Public files are available to anyone without the need for login.').'
- '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'
- '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'
'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'
';
+
+ if ($group eq '') {
+ $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme"));
+ }
+
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
@@ -610,19 +629,18 @@ sub display_access {
'continue' => &mt('Proceed'),
'cancel' => &mt('Back to directory listing'),
};
- &close_form($r,$url,$group,$button_text);
+ &close_form($r,$url,$button_text);
} else {
$r->print($header);
if ($aclcount) {
$r->print($info);
}
- &view_access_settings($r,$url,$group,$access_controls{$file_name},
- $aclcount,$refarg);
+ &view_access_settings($r,$url,$access_controls{$file_name},$aclcount);
}
}
sub view_access_settings {
- my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_;
+ my ($r,$url,$access_controls,$aclcount) = @_;
my ($showstart,$showend);
my %todisplay;
foreach my $key (sort(keys(%{$access_controls}))) {
@@ -643,15 +661,8 @@ 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_args().'">'.&mt('Return to directory listing').'');
return;
}
@@ -759,7 +770,7 @@ sub build_access_summary {
sub update_access {
- my ($r,$url,$group,$port_path,$refarg) = @_;
+ my ($r,$url,$group,$port_path) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -784,10 +795,10 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print(''.&mt('Allowing others to retrieve portfolio file: [_1]',
+ $r->print(''.&mt('Allowing others to retrieve file: [_1]',
$port_path.$file_name).'
'."\n");
- $file_name = &prepend_group($file_name,$group);
- my ($uname,$udom) = &get_name_dom($group);
+ $file_name = &prepend_group($file_name);
+ my ($uname,$udom) = &get_name_dom();
my ($errors,$outcome,$deloutcome,$new_values,$translation);
if ($totalprocessed) {
($outcome,$deloutcome,$new_values,$translation) =
@@ -858,7 +869,7 @@ sub update_access {
if ($allnew > 0) {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
- &open_form($r,$url,$group);
+ &open_form($r,$url);
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'}).'
');
@@ -873,21 +884,14 @@ sub update_access {
$access_controls{$file_name},$now,$then);
}
}
- &close_form($r,$url,$group);
+ &close_form($r,$url);
} else {
- my $group_arg;
- if ($group) {
- $group_arg = '&group='.$group;
- if ($refarg) {
- $group_arg .= '&'.$refarg;
- }
- }
$r->print('
'.
+ '¤tpath='.$env{'form.currentpath'}.&group_args().'">'.
&mt('Display all access settings for this file').''.
' '.
''.&mt('Return to directory listing').'');
+ &group_args().'">'.&mt('Return to directory listing').'');
}
return;
}
@@ -1455,7 +1459,7 @@ END_SCRIPT
}
sub select_files {
- my ($r,$group) = @_;
+ my ($r) = @_;
if ($env{'form.continue'} eq 'true') {
# here we update the selections for the currentpath
# eventually, have to handle removing those not checked, but . . .
@@ -1499,8 +1503,9 @@ ENDSMP
}
}
}
+
sub upload {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url,$group)=@_;
my $fname=$env{'form.uploaddoc.filename'};
my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
my $disk_quota = 20000; # expressed in k
@@ -1514,22 +1519,19 @@ sub upload {
}
$fname=&Apache::lonnet::clean_filename($fname);
- my $portfolio_root=&get_portfolio_root($group);
- my ($uname,$udom) = &get_name_dom($group);
- my $port_path = &get_port_path($group);
+ my $portfolio_root=&get_portfolio_root();
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
# Fixme --- Move the checking for existing file to LOND error return
- my @dir_list=&get_dir_list($portfolio_root,$group);
+ my @dir_list=&get_dir_list($portfolio_root);
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,$group);
+ $file_name = &prepend_group($file_name);
$found_file = 1;
- if (defined($group)) {
- $file_name = $group.'/'.$file_name;
- }
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$locked_file = 1;
}
@@ -1539,17 +1541,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,$group,$refarg));
+ $r->print(&done('Back',$url));
}
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,$group,$refarg));
+ $r->print(&done('Back',$url));
} 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,$group,$refarg));
+ $r->print(&done('Back',$url));
}
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
@@ -1557,20 +1559,20 @@ sub upload {
if ($result !~ m|^/uploaded/|) {
$r->print(''.'An errror occured ('.$result.
') while trying to upload '.&display_file().'
');
- $r->print(&done('Back',$url,$group,$refarg));
+ $r->print(&done('Back',$url));
} else {
- $r->print(&done(undef,$url,$group,$refarg));
+ $r->print(&done(undef,$url));
}
}
}
sub lock_info {
- my ($r,$url,$group,$refarg) = @_;
- my ($uname,$udom) = &get_name_dom($group);
+ my ($r,$url,$group) = @_;
+ my ($uname,$udom) = &get_name_dom();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my $file_name = $env{'form.lockinfo'};
- $file_name = &prepend_group($file_name,$group);
+ $file_name = &prepend_group($file_name);
if (defined($file_name) && defined($$current_permissions{$file_name})) {
foreach my $array_item (@{$$current_permissions{$file_name}}) {
if (ref($array_item) eq 'ARRAY') {
@@ -1593,21 +1595,22 @@ sub lock_info {
}
}
}
- $r->print(&done('Back',$url,$group,$refarg));
+ $r->print(&done('Back',$url));
return 'ok';
}
+
sub createdir {
- my ($r,$url,$group,$refarg)=@_;
+ my ($r,$url)=@_;
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,$group));
+ $r->print(&done(undef,$url));
return;
}
- my $portfolio_root = &get_portfolio_root($group);
- my @dir_list=&get_dir_list($portfolio_root,$group);
+ my $portfolio_root = &get_portfolio_root();
+ my @dir_list=&get_dir_list($portfolio_root);
my $found_file = 0;
foreach my $line (@dir_list) {
my ($filename)=split(/\&/,$line,2);
@@ -1619,8 +1622,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($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
@@ -1631,15 +1634,14 @@ 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,$group,$refarg));
+ $r->print(&done(undef,$url));
}
sub get_portfolio_root {
- my ($group) = @_;
- my ($portfolio_root,$udom,$uname,$path);
- ($uname,$udom) = &get_name_dom($group);
- if (defined($group)) {
- $path = '/userfiles/groups/'.$group.'/portfolio';
+ my ($uname,$udom) = &get_name_dom();
+ my $path;
+ if (defined($env{'form.group'})) {
+ $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
} else {
$path = '/userfiles/portfolio';
}
@@ -1664,16 +1666,15 @@ sub get_group_quota {
}
sub get_dir_list {
- my ($portfolio_root,$group) = @_;
- my ($uname,$udom) = &get_name_dom($group);
+ my ($portfolio_root) = @_;
+ my ($uname,$udom) = &get_name_dom();
return &Apache::lonnet::dirlist($env{'form.currentpath'},
$udom,$uname,$portfolio_root);
}
sub get_name_dom {
- my ($group) = @_;
my ($uname,$udom);
- if (defined($group)) {
+ if (defined($env{'form.group'})) {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
} else {
@@ -1684,28 +1685,26 @@ sub get_name_dom {
}
sub prepend_group {
- my ($filename,$group) = @_;
- if (defined($group)) {
- $filename = $group.$filename;
+ my ($filename) = @_;
+ if (defined($env{'form.group'})) {
+ $filename = $env{'form.group'}.$filename;
}
return $filename;
}
sub get_namespace {
- my ($group) = @_;
my $namespace = 'portfolio';
- if (defined($group)) {
- my ($uname,$udom) = &get_name_dom($group);
- $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+ if (defined($env{'form.group'})) {
+ my ($uname,$udom) = &get_name_dom();
+ $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
}
return $namespace;
}
sub get_port_path {
- my ($group) = @_;
my $port_path;
- if (defined($group)) {
- $port_path = "groups/$group/portfolio";
+ if (defined($env{'form.group'})) {
+ $port_path = "groups/$env{'form.group'}/portfolio";
} else {
$port_path = 'portfolio';
}
@@ -1713,7 +1712,7 @@ sub get_port_path {
}
sub missing_priv {
- my ($r,$url,$priv,$group,$refarg) = @_;
+ my ($r,$url,$priv) = @_;
my $longtext = {
upload => 'upload files',
delete => 'delete files',
@@ -1731,12 +1730,9 @@ sub missing_priv {
$r->print(&mt('Action disallowed
'));
$r->print(&mt('You do not have sufficient privileges to [_1] ',
$longtext->{$priv}));
- if ($group) {
+ if (defined($env{'form.group'})) {
$r->print(&mt("in the group's file repository."));
- $rtnlink .= '&group='.$group;
- if ($refarg ne '') {
- $rtnlink .= '&'.$refarg;
- }
+ $rtnlink .= &group_args()
} else {
$r->print(&mt('in this portfolio.'));
}
@@ -1747,21 +1743,21 @@ sub missing_priv {
}
sub coursegrp_portfolio_header {
- my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_;
+ my ($cdom,$cnum,$grp_desc)=@_;
my $gpterm = &Apache::loncommon::group_term();
my $ucgpterm = $gpterm;
$ucgpterm =~ s/^(\w)/uc($1)/e;
- if ($refarg) {
+ if ($env{'form.ref'}) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/coursegroups",
text=>"Groups",
title=>"Course Groups"});
}
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
+ ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
text=>"$ucgpterm: $grp_desc",
title=>"Go to group's home page"},
- {href=>"/adm/coursegrp_portfolio?group=$group&$refarg",
+ {href=>"/adm/coursegrp_portfolio?".&group_args(),
text=>"Group Portfolio",
title=>"Display group portfolio"});
my $output = &Apache::lonhtmlcommon::breadcrumbs(
@@ -1777,12 +1773,12 @@ sub handler {
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
'cnum','cdom','type','setroles','showversions','ref']);
- my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
+ my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
$caller = $2;
}
- my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg);
+ my ($can_modify,$can_delete,$can_upload,$can_setacl);
if ($caller eq 'coursegrp_portfolio') {
# Needs to be in a course
if (! ($env{'request.course.fn'})) {
@@ -1794,13 +1790,10 @@ sub handler {
my $earlyout = 0;
my $view_permission =
&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
- $group = $env{'form.group'};
- $group =~ s/\W//g;
+ $env{'form.group'} =~ s/\W//g;
+ $group = $env{'form.group'};
if ($group) {
- if (exists($env{'form.ref'})) {
- $refarg = 'ref='.$env{'form.ref'};
- }
- ($uname,$udom) = &get_name_dom($group);
+ ($uname,$udom) = &get_name_dom();
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
@@ -1809,7 +1802,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($group);
+ $portfolio_root = &get_portfolio_root();
} else {
$r->print('You do not have the privileges required to access the shared files space for this group.');
$earlyout = 1;
@@ -1853,7 +1846,7 @@ sub handler {
$can_setacl = 1;
}
- my $port_path = &get_port_path($group);
+ my $port_path = &get_port_path();
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1879,79 +1872,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,$group);
+ &close_form($r,$url);
}
if ($env{'form.store'}) {
}
if ($env{'form.uploaddoc.filename'}) {
if ($can_upload) {
- &upload($r,$url,$group,$refarg);
+ &upload($r,$url,$group);
} else {
- &missing_priv($r,$url,'upload',$group,$refarg),
+ &missing_priv($r,$url,'upload');
}
} elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_confirmed($r,$url,$group,$refarg);
+ &delete_confirmed($r,$url);
} else {
- &missing_priv($r,$url,'delete',$group,$refarg);
+ &missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url,$group,$refarg);
+ &delete($r,$url);
} else {
- &missing_priv($r,$url,'delete',$group,$refarg);
+ &missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url,$group,$refarg);
+ &delete_dir_confirmed($r,$url);
} else {
- &missing_priv($r,$url,'delete',$group,$refarg);
+ &missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'deletedir') {
if ($can_delete) {
- &delete_dir($r,$url,$group);
+ &delete_dir($r,$url);
} else {
- &missing_priv($r,$url,'delete',$group,$refarg);
+ &missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
if ($can_modify) {
- &rename_confirmed($r,$url,$group,$refarg);
+ &rename_confirmed($r,$url);
} else {
- &missing_priv($r,$url,'rename',$group,$refarg);
+ &missing_priv($r,$url,'rename');
}
} elsif ($env{'form.rename'}) {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url,$group,$refarg);
+ &rename($r,$url);
} else {
- &missing_priv($r,$url,'rename',$group,$refarg);
+ &missing_priv($r,$url,'rename');
}
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
$env{'form.action'} = 'chgaccess';
- &display_access($r,$url,$group,$can_setacl,$port_path,$refarg);
+ &display_access($r,$url,$group,$can_setacl,$port_path);
} elsif ($env{'form.action'} eq 'chgaccess') {
if ($can_setacl) {
- &update_access($r,$url,$group,$port_path,$refarg);
+ &update_access($r,$url,$group,$port_path);
} else {
- &missing_priv($r,$url,'setacl',$group,$refarg);
+ &missing_priv($r,$url,'setacl');
}
} elsif ($env{'form.action'} eq 'rolepicker') {
if ($can_setacl) {
&role_options_window($r);
} else {
- &missing_priv($r,$url,'setacl',$group,$refarg);
+ &missing_priv($r,$url,'setacl');
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url,$group,$refarg);
+ &createdir($r,$url);
} else {
- &missing_priv($r,$url,'upload',$group,$refarg);
+ &missing_priv($r,$url,'upload');
}
} elsif ($env{'form.lockinfo'}) {
- &lock_info($r,$url,$group,$refarg);
+ &lock_info($r,$url,$group);
} else {
my $current_path='/';
if ($env{'form.currentpath'}) {
@@ -1959,17 +1952,16 @@ sub handler {
}
if ($caller eq 'coursegrp_portfolio') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
- $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc,
- $refarg));
+ $r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
}
- my @dir_list=&get_dir_list($portfolio_root,$group);
+ my @dir_list=&get_dir_list($portfolio_root);
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($group));
+ &get_port_path());
} else {
# some directory that snuck in get rid of the directory
# from the recent pulldown, just in case
@@ -1983,11 +1975,10 @@ 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,$group,
- $can_upload,$refarg);
+ &display_common($r,$url,$current_path,$is_empty,\@dir_list,
+ $can_upload);
&display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
- $can_upload,$can_modify,$can_delete,$can_setacl,
- $refarg);
+ $can_upload,$can_modify,$can_delete,$can_setacl);
$r->print(&Apache::loncommon::end_page());
}
return OK;