'.
- '| Select | | Name | Size | Last Modified |
|---|
');
$r->print('');
+ '
+ );
+ }
}
}
@@ -287,44 +396,62 @@ sub open_form {
}
sub close_form {
- my ($r,$url,$group)=@_;
- $r->print('');
+ my ($r,$url,$group,$button_text)=@_;
+ if (!defined($button_text)) {
+ $button_text = {
+ 'continue' => &mt('Continue'),
+ 'cancel' => &mt('Cancel'),
+ };
+ }
+ $r->print('
');
if (defined($group)) {
$r->print("\n".'');
+ if (exists($env{'form.ref'})) {
+ $r->print("\n".'');
+ }
}
$r->print('
');
- $r->print('');
}
sub display_file {
my ($path,$filename)=@_;
my $display_file_text;
+ my $file_start='';
+ my $file_end='';
if (!defined($path)) { $path=$env{'form.currentpath'}; }
if (!defined($filename)) {
$filename=$env{'form.selectfile'};
- $display_file_text = ''.$path.$filename.'';
+ $display_file_text = $file_start.$path.$filename.$file_end;
} elsif (ref($filename) eq "ARRAY") {
- foreach (@$filename) {
- $display_file_text .= ''.$path.$_.'
';
+ foreach my $file (@$filename) {
+ $display_file_text .= $file_start.$path.$file.$file_end.'
';
}
} elsif (ref($filename) eq "SCALAR") {
- $display_file_text = ''.$path.$filename.'';
+ $display_file_text = $file_start.$path.$$filename.$file_end;
+ } else {
+ $display_file_text = $file_start.$path.$filename.$file_end;
}
return $display_file_text;
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url,$group,$refarg)=@_;
unless (defined $message) {
$message='Done';
}
@@ -333,14 +460,17 @@ sub done {
'&fieldname='.$env{'form.fieldname'}.
'&mode='.$env{'form.mode'};
if (defined($group)) {
- $result .= '&group='.$group;
+ $result .= '&group='.$group;
+ if ($refarg ne '') {
+ $result .= '&'.$refarg;
+ }
}
$result .= '">'.&mt($message).'';
return $result;
}
sub delete {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$file_name = &prepend_group($file_name,$group);
@@ -348,7 +478,7 @@ sub delete {
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,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
if (scalar(@files)) {
&open_form($r,$url);
@@ -356,13 +486,13 @@ sub delete {
&close_form($r,$url,$group);
} else {
$r->print("No file was checked to delete.
");
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
}
}
sub delete_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
my ($uname,$udom) = &get_name_dom($group);
@@ -372,11 +502,11 @@ sub delete_confirmed {
$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(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub delete_dir {
@@ -387,7 +517,7 @@ sub delete_dir {
}
sub delete_dir_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
my ($uname,$udom) = &get_name_dom($group);
@@ -397,8 +527,8 @@ sub delete_dir_confirmed {
$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(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub rename {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
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(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
} else {
&open_form($r,$url);
$r->print(''.&mt('Rename').' '.&display_file().' to
@@ -432,15 +562,15 @@ sub rename {
}
sub rename_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
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(undef,$url,$group));
+ '
');
+ $r->print(&done(undef,$url,$group,$refarg));
return;
}
my $result=
@@ -448,41 +578,196 @@ sub rename_confirmed {
$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("The new file name was changed from:
".$env{'form.filenewname'}." to $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(&done(undef,$url,$group,$refarg));
}
sub display_access {
- my ($r,$url,$group) = @_;
+ 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,$group);
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 the following types: public.').'
- '.&mt('Public files are available to anyone without the need for login.').'
');
- &access_setting_table($r,$access_controls{$file_name});
- &close_form($r,$url,$group);
+ 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.').'
- '.&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,$refarg);
+ }
}
+sub view_access_settings {
+ my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_;
+ 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 $group_arg;
+ if ($group) {
+ $group_arg = '&group='.$group;
+ if ($refarg ne '') {
+ $group_arg .= '&'.$refarg;
+ }
+ }
+ $r->print('
'.&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',
+ group => 'Conditional: group-based',
+ );
+ my @allscopes = ('public','guest','domains','users','course','group');
+ 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') || ($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('Passphrase').': '.$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)/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,$refarg) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
- 'activate' => 'New controls added',
- 'delete' => 'Existing controls deleted',
- 'update' => 'Existing controls modified',
+ 'activate' => 'New control(s) added',
+ 'delete' => 'Existing control(s) deleted',
+ 'update' => 'Existing control(s) modified',
);
- my $changes;
+ my $changes;
foreach my $chg (sort(keys(%title))) {
@{$processing{$chg}} = &Apache::loncommon::get_env_multiple('form.'.$chg);
$totalprocessed += @{$processing{$chg}};
@@ -494,89 +779,188 @@ sub update_access {
$$changes{$chg}{$newkey} = 1;
} else {
$$changes{$chg}{$newkey} =
- &build_access_record($num,$scope,$start,$end);
+ &build_access_record($num,$scope,$start,$end,$chg);
}
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print('');
+ $r->print(''.&mt('Public access:').' '.$publictext.'');
$r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print(' | '.&mt('Action').' | '.&mt('Dates available').' | ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
- $r->print(''.&mt('Access Type').' | '.
- &mt('Settings').' | '."\n");
+ if ($public) {
+ $r->print(''.&actionbox('old',$publicnum,'public').' | '.
+ &dateboxes($publicnum,$start{$public},$end{$public}).' | ');
+ } else {
+ $r->print(''.&actionbox('new','0','public').' | '.
+ &dateboxes('0',$now,$then).' | ');
+ }
$r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::start_data_table_row());
- $r->print('Public
'.$publictext.' | ');
+ $r->print(&Apache::loncommon::end_data_table());
+ $r->print(' | | ');
+ $r->print(''.&mt('Passphrase-protected access:').' '.$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('Passphrase').' | ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
- my ($pub_startdate,$pub_enddate,$pub_action,$pub_noend);
- if ($public) {
- my ($num,$end,$start) = ($public =~ /^([^:]+):[a-z]+_(\d*)_?(\d*)$/);
- if ($end == 0) {
- $pub_noend = 'checked="checked"';
- }
- $pub_action = ''.&mt('Delete').'
'.&mt('Update').
- ' | ';
- $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
- 'startdate_'.$num,$start,undef,undef,undef,1,undef,
- undef,undef,1);
- $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
- 'enddate_'.$num,$end,undef,undef,undef,1,undef,
- undef,undef,1).
- ' '.&mt('No end date').'';
- } else {
- $pub_action = ''.
- &mt('Activate').
- '';
- $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
- 'startdate_0',$now,undef,undef,undef,1,undef,
- undef,undef,1);
- $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
- 'enddate_0',$then,,undef,undef,undef,1,undef,
- undef,undef,1).
- ' '.&mt('No end date').
- '';
-
+ my $passwd;
+ if ($guest) {
+ $passwd = $$access_controls{$guest}{'password'};
+ $r->print(''.&actionbox('old',$guestnum,'guest').' | '.
+ &dateboxes($guestnum,$start{$guest},$end{$guest}).' | ');
+ } else {
+ $r->print(''.&actionbox('new','1','guest').' | '.
+ &dateboxes('1',$now,$then).' | ');
}
- $r->print(''.$pub_action.' | '.&mt('Start: ').$pub_startdate.
- '
'.&mt('End: ').$pub_enddate.' | ');
+ $r->print(' | ');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
+ $r->print('
|---|
| |
| ');
+ &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+ $r->print(' | | ');
+ &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+ $r->print(' |
|
');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('| ');
+ } else {
+ $r->print(' | ');
+ }
+ &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
$r->print(' | ');
- $r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::end_data_table());
+ 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');
+ }
+ if ($end && $end<$now) {
+ return &mt('Inactive');
+ }
+ return &mt('Active');
+}
+
+sub access_element {
+ my ($r,$type,$acl_count,$items,$access_controls,$now,$then) = @_;
+ my $title = $type;
+ $title =~ s/s$//;
+ $title =~ s/^(\w)/uc($1)/e;
+ $r->print('