'.
- 'Select Name Size Last Modified ');
+ $r->print(''.
+ 'Select Name Size Last Modified ');
} else {
$r->print('
');
+ if ($can_delete) {
+ $r->print('
+ '.
+ &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
- ');
+ '
+ );
+ }
}
}
@@ -308,7 +476,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'),
@@ -316,19 +484,12 @@ sub close_form {
};
}
$r->print(' ');
- if (defined($group)) {
- $r->print("\n".' ');
- }
- $r->print('
');
+ $r->print(&group_form_data().'');
$r->print('');
}
@@ -355,39 +516,38 @@ sub display_file {
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url)=@_;
unless (defined $message) {
$message='Done';
}
- my $result = '';
+ my %anchor_fields = (
+ 'showversions' => $env{'form.showversions'},
+ 'currentpath' => $env{'form.currentpath'},
+ 'fieldname' => $env{'form.fieldname'},
+ 'mode' => $env{'form.mode'}
+ );
+ my $result = ''.&make_anchor($url,\%anchor_fields,&mt($message)).' ';
return $result;
}
sub delete {
- my ($r,$url,$group)=@_;
+ 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));
+ $r->print("The file is locked and cannot be deleted. ");
+ $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));
+ $r->print(&done(undef,$url));
}
}
}
@@ -396,34 +556,71 @@ sub delete_confirmed {
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);
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
foreach my $delete_file (@files) {
$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(''.
+ &mt('An error occured ([_1]) while trying to delete
+ [_2].',$result,&display_file(undef, $delete_file)).
+ ' ');
+ } else {
+ $r->print(&mt('File: [_1] deleted.',
+ &display_file(undef,$delete_file)));
+ my $file_name = $env{'form.currentpath'}.$delete_file;
+ $file_name = &prepend_group($file_name);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,
+ $group,$file_name);
+ if (keys(%access_controls) > 0) {
+ my %changes;
+ foreach my $key (keys(%{$access_controls{$file_name}})) {
+ $changes{'delete'}{$key} = 1;
+ }
+ if (keys(%changes) > 0) {
+ my ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($file_name,\%changes,
+ $udom,$uname);
+ if ($outcome ne 'ok') {
+ $r->print(' '.&mt("An error occured ([_1]) while ".
+ "trying to delete access controls for the file.",$outcome).
+ ' ');
+ } else {
+ if ($deloutcome eq 'ok') {
+ $r->print(' '.&mt('Access controls also deleted for the file.').' ');
+ } else {
+ $r->print(''.' '.
+ &mt("An error occured ([_1]) while ".
+ "trying to delete access controls for the file.",$deloutcome).
+ ' ');
+ }
+ }
+ }
+ }
}
}
- $r->print(&done(undef,$url,$group));
+ $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)=@_;
+ 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);
@@ -443,76 +640,292 @@ sub delete_dir_confirmed {
}
$env{'form.currentpath'} = $directory_name;
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url));
}
sub rename {
- my ($r,$url,$group)=@_;
+ 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));
+ $r->print("The file is locked and cannot be renamed. ");
+ $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)=@_;
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));
+ $r->print(&done(undef,$url));
return;
}
+ my $chg_access;
my $result=
&Apache::lonnet::renameuserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
$port_path.$env{'form.currentpath'}.$filenewname);
- if ($result ne 'ok') {
+ if ($result eq 'ok') {
+ $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
+ } else {
$r->print(''.
- &mt('An errror occured ([_1]) while trying to rename [_2]'
+ &mt('An error occured ([_1]) while trying to rename [_2]'
.' to [_3]',$result,&display_file(),
&display_file('',$filenewname)).' ');
+ return;
}
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));
+ $r->print($chg_access);
+ $r->print(&done(undef,$url));
+}
+
+sub access_for_renamed {
+ my ($filenewname,$group,$udom,$uname) = @_;
+ my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'};
+ $oldfile = &prepend_group($oldfile);
+ my $newfile = $env{'form.currentpath'}.$filenewname;
+ $newfile = &prepend_group($newfile);
+ my $current_permissions =
+ &Apache::lonnet::get_portfile_permissions($udom,$uname);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,
+ $group,$oldfile);
+ my $chg_text;
+ if (keys(%access_controls) > 0) {
+ my %change_old;
+ my %change_new;
+ foreach my $key (keys(%{$access_controls{$oldfile}})) {
+ $change_old{'delete'}{$key} = 1;
+ $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key};
+ }
+ my ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($oldfile,\%change_old,
+ $udom,$uname);
+ if ($outcome ne 'ok') {
+ $chg_text =' '.&mt("An error occured ([_1]) while ".
+ "trying to delete access control records for the old name.",$outcome).
+ ' ';
+ } else {
+ if ($deloutcome ne 'ok') {
+ $chg_text = ' '.
+ &mt("An error occured ([_1]) while ".
+ "trying to delete access control records for the old name.",$deloutcome).
+ ' ';
+ }
+ }
+ ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($newfile,\%change_new,
+ $udom,$uname);
+ if ($outcome ne 'ok') {
+ $chg_text .= ' '.
+ &mt("An error occured ([_1]) while ".
+ "trying to update access control records for the new name.",$outcome).
+ ' ';
+ }
+ if ($chg_text eq '') {
+ $chg_text = ' '.&mt('Access controls updated to reflect the name change.');
+ }
+ }
+ return $chg_text;
}
sub display_access {
- my ($r,$url,$group) = @_;
- my ($uname,$udom) = &get_name_dom($group);
+ my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
+ 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);
- &open_form($r,$url);
- $r->print(''.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).' '."\n");
- $r->print(&mt('Access to this file by others can be set to be one or more of the following types: public, password-protected or conditional.').''.&mt('Public files are available to anyone without the need for login.').' '.&mt('Password-protected files do not require log-in, but will require the viewer to enter the password you set.').' '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satify 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 you can grant access to people with specific LON-CAPA usernames and domains.').' ');
- &access_setting_table($r,$access_controls{$file_name});
- my $button_text = {
+ my $aclcount = keys(%access_controls);
+ my ($header,$info);
+ if ($action eq 'chgaccess') {
+ $header = ''.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).' ';
+ $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.');
+ $info .= ''.&mt('Public files are available to anyone without the need for login.');
+ $info .= ' '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
+ $info .= ' '.&explain_conditionals();
+ $info .= ' ';
+ if ($group eq '') {
+ $info .= (&mt("A listing of files viewable without log-in is available at: http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio . For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme "));
+ }
+ } else {
+ $header = ''.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).' '.
+ &explain_conditionals().' ';
+ }
+ if ($can_setacl) {
+ &open_form($r,$url);
+ $r->print($header.$info);
+ $r->print(' '.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access'));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings'));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access'));
+ &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
+ $action);
+ my $button_text = {
'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,$access_controls{$file_name},$aclcount);
+ }
+}
+
+sub explain_conditionals {
+ return
+ &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').' '."\n".
+ &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').' '."\n".
+ &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+}
+
+sub view_access_settings {
+ my ($r,$url,$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('Current access controls defined for this file: '));
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print(''.&mt('Access control').' '.&mt('Dates available').
+ ' '.&mt('Additional information').' ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ my $count = 1;
+ my $chg = 'none';
+ &build_access_summary($r,$count,$chg,%todisplay);
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&mt('No access control settings currently exist for this file. ' ));
+ }
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'}
+ );
+ $r->print(' '.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
+ return;
+}
+
+sub build_access_summary {
+ my ($r,$count,$chg,%todisplay) = @_;
+ my ($showstart,$showend);
+ my %scope_desc = (
+ public => 'Public',
+ guest => 'Passphrase-protected',
+ domains => 'Conditional: domain-based',
+ users => 'Conditional: user-based',
+ course => 'Conditional: course-based',
+ );
+ my @allscopes = ('public','guest','domains','users','course');
+ foreach my $scope (@allscopes) {
+ if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) {
+ next;
+ }
+ foreach my $key (sort(keys(%{$todisplay{$scope}}))) {
+ if ($count) {
+ $r->print(&Apache::loncommon::start_data_table_row());
+ }
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my $content = $todisplay{$scope}{$key};
+ if ($chg eq 'delete') {
+ $showstart = &mt('Deleted');
+ $showend = $showstart;
+ } else {
+ $showstart = localtime($start);
+ if ($end == 0) {
+ $showend = &mt('No end date');
+ } else {
+ $showend = localtime($end);
+ }
+ }
+ $r->print(''.&mt($scope_desc{$scope}));
+ if ($scope eq 'course') {
+ if ($chg ne 'delete') {
+ my $cid = $content->{'domain'}.'_'.$content->{'number'};
+ my %course_description = &Apache::lonnet::coursedescription($cid);
+ $r->print(' ('.$course_description{'description'}.')');
+ }
+ }
+ $r->print(' '.&mt('Start: ').$showstart.
+ ' '.&mt('End: ').$showend.' ');
+ if ($chg ne 'delete') {
+ if ($scope eq 'guest') {
+ $r->print(&mt('Passphrase').': '.$content->{'password'});
+ } elsif ($scope eq 'course') {
+ $r->print('');
+ $r->print(''.&mt('Roles').' '.
+ &mt('Access').' '.
+ &mt('Sections').' ');
+ $r->print(''.&mt('Groups').' ');
+ $r->print(' ');
+ foreach my $id (sort(keys(%{$content->{'roles'}}))) {
+ $r->print('');
+ foreach my $item ('role','access','section','group') {
+ $r->print('');
+ if ($item eq 'role') {
+ my $ucscope = $scope;
+ $ucscope =~ s/^(\w)/uc($1)/e;
+ my $role_output;
+ foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
+ if ($role eq 'all') {
+ $role_output .= $role.',';
+ } elsif ($role =~ /^cr/) {
+ $role_output .= (split('/',$role))[3].',';
+ } else {
+ $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
+ }
+ }
+ $role_output =~ s/,$//;
+ $r->print($role_output);
+ } else {
+ $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
+ }
+ $r->print(' ');
+ }
+ $r->print(' ');
+ }
+ $r->print('
');
+ } elsif ($scope eq 'domains') {
+ $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
+ } elsif ($scope eq 'users') {
+ my $curr_user_list = &sort_users($content->{'users'});
+ $r->print(&mt('Users: ').$curr_user_list);
+ } else {
+ $r->print(' ');
+ }
+ } else {
+ $r->print(' ');
+ }
+ $r->print(' ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
}
+
sub update_access {
- my ($r,$url,$group) = @_;
+ my ($r,$url,$group,$port_path) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -537,10 +950,10 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print(''.&mt('Allowing others to retrieve portfolio file: [_1]',
- $file_name).' '."\n");
- $file_name = &prepend_group($file_name,$group);
- my ($uname,$udom) = &get_name_dom($group);
+ $r->print(''.&mt('Allowing others to retrieve file: [_1]',
+ $port_path.$file_name).' '."\n");
+ $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) =
@@ -577,93 +990,16 @@ sub update_access {
$r->print(''.&mt($title{$chg}).
'. ');
my $count = 0;
+ my %todisplay;
foreach my $key (sort(keys(%{$$changes{$chg}}))) {
- if ($count) {
- $r->print(&Apache::loncommon::start_data_table_row());
- }
- my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
my $newkey = $key;
if ($chg eq 'activate') {
$newkey =~ s/^(\d+)/$$translation{$1}/;
}
- my $content = $$updated_controls{$newkey};
- if ($chg eq 'delete') {
- $showstart = &mt('Deleted');
- $showend = $showstart;
- } else {
- $showstart = localtime($start);
- if ($end == 0) {
- $showend = &mt('No end date');
- } else {
- $showend = localtime($end);
- }
- }
- $r->print(''.&mt($scope));
- if (($scope eq 'course') || ($scope eq 'group')) {
- if ($chg ne 'delete') {
- my $cid = $content->{'domain'}.'_'.$content->{'number'};
- my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print(' ('.$course_description{'description'}.')');
- }
- }
- $r->print(' '.&mt('Start: ').$showstart.
- ' '.&mt('End: ').$showend.' ');
- if ($chg ne 'delete') {
- if ($scope eq 'guest') {
- $r->print(&mt('Password').': '.$content->{'password'});
- } elsif ($scope eq 'course' || $scope eq 'group') {
- $r->print('');
- $r->print(''.&mt('Roles').' '.
- &mt('Access').' '.
- &mt('Sections').' ');
- if ($scope eq 'course') {
- $r->print(''.&mt('Groups').' ');
- } else {
- $r->print(''.&mt('Teams').' ');
- }
- $r->print(' ');
- foreach my $id (sort(keys(%{$content->{'roles'}}))) {
- $r->print('');
- foreach my $item ('role','access','section','group') {
- $r->print('');
- if ($item eq 'role') {
- my $ucscope = $scope;
- $ucscope =~ s/^(\w)/uc($1)/;
- my $role_output;
- foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
- if ($role eq 'all') {
- $role_output .= $role.',';
- } elsif ($role =~ /^cr/) {
- $role_output .= (split('/',$role))[3].',';
- } else {
- $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
- }
- }
- $role_output =~ s/,$//;
- $r->print($role_output);
- } else {
- $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
- }
- $r->print(' ');
- }
- }
- $r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::end_data_table());
- } elsif ($scope eq 'domains') {
- $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
- } elsif ($scope eq 'users') {
- my $curr_user_list = &sort_users($content->{'users'});
- $r->print(&mt('Users: ').$curr_user_list);
- } else {
- $r->print(' ');
- }
- } else {
- $r->print(' ');
- }
- $r->print('');
- $r->print(&Apache::loncommon::end_data_table_row());
- $count ++;
+ $todisplay{$scope}{$newkey} = $$updated_controls{$newkey};
}
+ &build_access_summary($r,$count,$chg,%todisplay);
}
}
$r->print(&Apache::loncommon::end_data_table());
@@ -682,14 +1018,14 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- foreach my $newitem ('course','group','domains','users') {
+ foreach my $newitem ('course','domains','users') {
$allnew += $env{'form.new'.$newitem};
}
if ($allnew > 0) {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
- &open_form($r,$url,$group);
- foreach my $newitem ('course','group','domains','users') {
+ &open_form($r,$url);
+ foreach my $newitem ('course','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'}).' ');
$firstitem = $totalnew;
@@ -703,11 +1039,15 @@ sub update_access {
$access_controls{$file_name},$now,$then);
}
}
- &close_form($r,$url,$group);
+ &close_form($r,$url);
} else {
- $r->print(''.
- &mt('Display all access settings for this file').' ');
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'},
+ 'access' => $env{'form.selectfile'}
+ );
+ $r->print(' '.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+ delete $anchor_fields{'access'};
+ $r->print(' '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
}
return;
}
@@ -724,7 +1064,7 @@ sub build_access_record {
if ($scope eq 'guest') {
$record->{'password'} = $env{'form.password'};
- } elsif (($scope eq 'course') || ($scope eq 'group')) {
+ } elsif ($scope eq 'course') {
$record->{'domain'} = $env{'form.crsdom_'.$num};
$record->{'number'} = $env{'form.crsnum_'.$num};
my @role_ids;
@@ -806,19 +1146,18 @@ sub sort_users {
}
sub access_setting_table {
- my ($r,$access_controls) = @_;
+ my ($r,$url,$filename,$access_controls,$action) = @_;
my ($public,$publictext);
- $publictext = &mt('Off');
+ $publictext ='Off';
my ($guest,$guesttext);
- $guesttext = &mt('Off');
+ $guesttext = 'Off';
my @courses = ();
- my @groups = ();
my @domains = ();
my @users = ();
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
my ($num,$scope,$publicnum,$guestnum);
- my (%acl_count,%end,%start);
+ my (%acl_count,%end,%start,%conditionals);
foreach my $key (sort(keys(%{$access_controls}))) {
($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
if ($scope eq 'public') {
@@ -829,19 +1168,34 @@ sub access_setting_table {
$guest=$key;
$guestnum = $num;
$guesttext = &acl_status($start{$key},$end{$key},$now);
- } elsif ($scope eq 'course') {
- push(@courses,$key);
- } elsif ($scope eq 'group') {
- push(@groups,$key);
- } elsif ($scope eq 'domains') {
- push(@domains,$key);
- } elsif ($scope eq 'users') {
- push(@users,$key);
+ } else {
+ $conditionals{$scope}{$key} = $$access_controls{$key};
+ if ($scope eq 'course') {
+ push(@courses,$key);
+ } elsif ($scope eq 'domains') {
+ push(@domains,$key);
+ } elsif ($scope eq 'users') {
+ push(@users,$key);
+ }
}
$acl_count{$scope} ++;
}
$r->print('');
- $r->print(''.&mt('Public access:').' '.$publictext.' ');
+ if ($action eq 'chgaccess') {
+ &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
+ \%end,$public,$publicnum,$publictext,$guest,$guestnum,
+ $guesttext,$access_controls,%conditionals);
+ } else {
+ &condition_setting($r,$access_controls,$now,$then,\%acl_count,
+ \@domains,\@users,\@courses);
+ }
+ $r->print('
');
+}
+
+sub standard_settings {
+ my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
+ $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
+ $r->print(''.&mt('Public access: [_1]',$publictext).' ');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(''.&mt('Action').' '.&mt('Dates available').' ');
@@ -849,7 +1203,7 @@ sub access_setting_table {
$r->print(&Apache::loncommon::start_data_table_row());
if ($public) {
$r->print(''.&actionbox('old',$publicnum,'public').' '.
- &dateboxes($publicnum,$start{$public},$end{$public}).' ');
+ &dateboxes($publicnum,$start->{$public},$end->{$public}).'');
} else {
$r->print(''.&actionbox('new','0','public').' '.
&dateboxes('0',$now,$then).' ');
@@ -857,18 +1211,18 @@ sub access_setting_table {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print(' ');
- $r->print(''.&mt('Password-protected access:').' '.$guesttext.' ');
+ $r->print(''.&mt('Passphrase-protected access: [_1]',$guesttext).' ');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(' '.&mt('Action').' '.&mt('Dates available').
- ' '. &mt('Password').' ');
+ ''. &mt('Passphrase').' ');
$r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
my $passwd;
if ($guest) {
$passwd = $$access_controls{$guest}{'password'};
$r->print(''.&actionbox('old',$guestnum,'guest').' '.
- &dateboxes($guestnum,$start{$guest},$end{$guest}).' ');
+ &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'');
} else {
$r->print(''.&actionbox('new','1','guest').' '.
&dateboxes('1',$now,$then).' ');
@@ -877,36 +1231,75 @@ sub access_setting_table {
$passwd.'" />');
$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(' '.
+ '');
+ my $numconditionals = 0;
+ my $conditionstext;
+ my %cond_status;
+ foreach my $scope ('domains','users','course') {
+ $numconditionals += $acl_count->{$scope};
+ if ($acl_count->{$scope} > 0) {
+ if ($conditionstext ne 'Active') {
+ foreach my $key (keys(%{$conditionals{$scope}})) {
+ $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
+ if ($conditionstext eq 'Active') {
+ last;
+ }
+ }
+ }
+ }
+ }
+ if ($conditionstext eq '') {
+ $conditionstext = 'Off';
+ }
+ my %anchor_fields = (
+ 'access' => $env{'form.selectfile'},
+ 'action' => 'chgconditions',
+ 'currentpath' => $env{'form.currentpath'},
+ );
+ $r->print(''.&mt('Conditional access: [_1]',$conditionstext).' ');
+ if ($numconditionals > 0) {
+ my $count = 1;
+ my $chg = 'none';
+ $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).' ');
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print(' '.&mt('Access control').' '.&mt('Dates available').
+ ' '.&mt('Additional information').' ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ &build_access_summary($r,$count,$chg,%conditionals);
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+ }
+}
+
+sub condition_setting {
+ my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+ $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);
+ &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
$r->print(' ');
- if (@courses > 0 || @groups > 0) {
+ if ($acl_count->{course} > 0) {
$r->print('');
} else {
$r->print(' ');
}
- &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ &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('
');
}
sub acl_status {
my ($start,$end,$now) = @_;
if ($start > $now) {
- return &mt('Inactive');
+ return 'Inactive';
}
if ($end && $end<$now) {
- return &mt('Inactive');
+ return 'Inactive';
}
- return &mt('Active');
+ return 'Active';
}
sub access_element {
@@ -941,7 +1334,7 @@ sub display_access_row {
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(' '.&mt('Action?').' '.&mt($uctype).' '.
&mt('Dates available').' ');
- if (($type eq 'course') || ($type eq 'group')) {
+ if ($type eq 'course') {
$r->print(''.&mt('Allowed [_1] member affiliations',$type).
' ');
$colspan ++;
@@ -951,7 +1344,7 @@ sub display_access_row {
$r->print(&Apache::loncommon::end_data_table_header_row());
foreach my $key (@{$items}) {
$r->print(&Apache::loncommon::start_data_table_row());
- if (($type eq 'course') || ($type eq 'group')) {
+ if ($type eq 'course') {
&course_row($r,$status,$type,$key,$access_controls,$now,$then);
} elsif ($type eq 'domains') {
&domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
@@ -1028,10 +1421,8 @@ sub course_row {
}
my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
.&course_js();
- my $crsgrptext = 'Groups';
- if ($type eq 'group') {
- $crsgrptext = 'Teams';
- }
+ my $uctype = $type;
+ $uctype =~ s/^(\w)/uc($1)/e;
my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then,
$type);
$r->print(''.$js.&actionbox($status,$num,$scope).' ');
@@ -1040,15 +1431,13 @@ sub course_row {
my %course_description = &Apache::lonnet::coursedescription($cid);
$r->print(' '.$course_description{'description'}.' ');
} elsif ($status eq 'new') {
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
$r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).' ');
}
$r->print(''.&dateboxes($num,$start,$end).' ');
$r->print(' '.&mt('Add a roles-based condition').' {'domain'}','$content->{'number'}','Course'".')" value="'.$max_id.'" /> ');
+ $r->print('