--- loncom/interface/portfolio.pm 2005/02/11 06:18:52 1.74
+++ loncom/interface/portfolio.pm 2006/06/27 15:38:08 1.121.2.1
@@ -29,142 +29,156 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::longroup;
+use HTML::Entities;
+use LONCAPA;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
- my ($filename, $current_path, $current_mode, $field_name) = @_;
- my $anchor = ''.$filename.'';
+ my ($url, $filename, $current_path, $current_mode, $field_name,
+ $continue_select,$group) = @_;
+ if ($continue_select ne 'true') {$continue_select = 'false'};
+ my $anchor = ''.$filename.'';
return $anchor;
}
my $dirptr=16384;
sub display_common {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
- my $iconpath= $r->dir_config('lonIconsURL') . "/";
- $r->print('
');
- $r->print('
');
- my $displayOut = '';
- $r->print($displayOut);
- $r->print('
');
- &close_form($r);
+ &close_form($r,$url,$group);
} else {
$r->print("No file was checked to delete. ");
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
}
}
sub delete_confirmed {
- my ($r)=@_;
+ my ($r,$url,$group)=@_;
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);
foreach my $delete_file (@files) {
- $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
- $ENV{'form.currentpath'}.
+ $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
+ $env{'form.currentpath'}.
$delete_file);
if ($result ne 'ok') {
- $r->print(' An error occured ('.$result.
- ') while trying to delete '.&display_file(undef, $delete_file).' ');
+ $r->print(' An error occured ('.$result.
+ ') while trying to delete '.&display_file(undef, $delete_file).' ');
}
}
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
sub delete_dir {
- my ($r)=@_;
- &open_form($r);
+ my ($r,$url,$group)=@_;
+ &open_form($r,$url);
$r->print('
'.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ &close_form($r,$url,$group);
}
sub delete_dir_confirmed {
- my ($r)=@_;
- my $directory_name = $ENV{'form.currentpath'};
- $directory_name =~ m/\/$/;
- $directory_name = $`;
- my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
+ my ($r,$url,$group)=@_;
+ 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 $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
if ($result ne 'ok') {
- $r->print(' An error occured (dir) ('.$result.
- ') while trying to delete '.$directory_name.' ');
+ $r->print(' An error occured (dir) ('.$result.
+ ') while trying to delete '.$directory_name.' ');
} else {
# now remove from recent
# $r->print(' removing '.$directory_name.' print(&done());
+ $r->print(&done(undef,$url,$group));
}
sub rename {
- my ($r)=@_;
- my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
- if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+ my ($r,$url,$group)=@_;
+ my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
+ 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());
+ $r->print(&done(undef,$url,$group));
} else {
- &open_form($r);
+ &open_form($r,$url);
$r->print('
'.&mt('Rename').' '.&display_file().' to
?
');
- &close_form($r);
+ &close_form($r,$url,$group);
}
}
sub rename_confirmed {
- my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ my ($r,$url,$group)=@_;
+ my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
if ($filenewname eq '') {
- $r->print(''.
+ $r->print(''.
&mt("Error: no valid filename was provided to rename to.").
- ' ');
- $r->print(&done());
+ ' ');
+ $r->print(&done(undef,$url,$group));
return;
}
my $result=
- &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
- 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
- 'portfolio'.$ENV{'form.currentpath'}.$filenewname);
+ &Apache::lonnet::renameuserfile($uname,$udom,
+ $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
+ $port_path.$env{'form.currentpath'}.$filenewname);
if ($result ne 'ok') {
- $r->print(' An errror occured ('.$result.
- ') while trying to rename '.&display_file().' to '.
- &display_file(undef,$filenewname).' ');
+ $r->print(''.
+ &mt('An errror occured ([_1]) while trying to rename [_2]'
+ .' to [_3]',$result,&display_file(),
+ &display_file('',$filenewname)).' ');
+ }
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print(&mt("The new file name was changed from: [_1] to [_2]",
+ ''.&display_file('',$env{'form.filenewname'}).'',
+ ''.&display_file('',$filenewname).''));
+ }
+ $r->print(&done(undef,$url,$group));
+}
+
+sub display_access {
+ my ($r,$url,$group,$can_setacl) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $file_name = $env{'form.currentpath'}.$env{'form.access'};
+ $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]',$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 ($can_setacl) {
+ &open_form($r,$url);
+ $r->print($header.$info);
+ &access_setting_table($r,$access_controls{$file_name});
+ my $button_text = {
+ 'continue' => &mt('Proceed'),
+ 'cancel' => &mt('Back to directory listing'),
+ };
+ &close_form($r,$url,$group,$button_text);
+ } else {
+ $r->print($header);
+ if ($aclcount) {
+ $r->print($info);
+ }
+ &view_access_settings($r,$url,$group,$access_controls{$file_name},
+ $aclcount);
+ }
+}
+
+sub view_access_settings {
+ my ($r,$url,$group,$access_controls,$aclcount) = @_;
+ my ($showstart,$showend);
+ my %todisplay;
+ foreach my $key (sort(keys(%{$access_controls}))) {
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ $todisplay{$scope}{$key} = $$access_controls{$key};
+ }
+ if ($aclcount) {
+ $r->print(&mt('
';
+ return $output;
+}
+
+sub role_options_window {
+ my ($r) = @_;
+ my $cdom = $env{'form.cdom'};
+ my $cnum = $env{'form.cnum'};
+ my $type = $env{'form.type'};
+ my $addindex = $env{'form.setroles'};
+ my $grouptitle = 'Groups';
+ if ($type eq 'Group') {
+ $grouptitle = 'Teams';
+ }
+ my $role_selects = &role_selectors(1,1,'new',$type,undef,'rolepicker');
+ $r->print(<<"END_SCRIPT");
+
+END_SCRIPT
+ $r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
+ $r->print('
'.&mt('Roles').'
'.&mt('[_1] status',$type).'
'.&mt('Sections').'
'.&mt($grouptitle).'
'.$role_selects.'
');
+ return;
+}
+
sub select_files {
- my ($r)=@_;
- if ($ENV{'form.continue'} eq 'true') {
+ 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 . . .
- my @items=&Apache::loncommon::get_env_multiple('form.selectfile');
- &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
+ my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+ if (scalar(@items)){
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ }
} else {
- if ($ENV{'form.currentpath'} eq '/') {
#empty the file for a fresh start
- # &Apache::lonnet::clear_selected_files($ENV{'user.name'});
- }
+ &Apache::lonnet::clear_selected_files($env{'user.name'});
}
- my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+ my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
my $java_files = join ",", @files;
if ($java_files) {
$java_files.=',';
}
my $javascript =(<
+