'.
+ $r->print(''.
'| Select | | Name | Size | Last Modified |
|---|
');
} else {
$r->print('');
+ '
+ );
+ }
}
}
@@ -332,16 +369,20 @@ sub close_form {
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;
}
@@ -395,8 +436,8 @@ 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));
@@ -420,8 +461,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(''.
+ $r->print(''.
&mt("Error: no valid filename was provided to rename to.").
- '
');
+ '
');
$r->print(&done(undef,$url,$group));
return;
}
@@ -471,39 +512,198 @@ 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));
}
sub display_access {
- my ($r,$url,$group) = @_;
+ 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);
- &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 = ''.&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);
+ &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('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;
+ }
+ $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 $function = &Apache::loncommon::get_users_function();
- my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -557,7 +757,9 @@ sub update_access {
if (@{$processing{$chg}} > 0) {
if ($chg eq 'delete') {
if (!($deloutcome eq 'ok')) {
- $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+ $errors .=''.
+ &mt('A problem occurred deleting access controls: [_1]',$deloutcome).
+ '';
next;
}
}
@@ -566,100 +768,24 @@ 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());
} else {
if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
- $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);
+ $errors .= ''.
+ &mt('A problem occurred storing access control settings: [_1]',$outcome).
+ '';
}
}
if ($errors) {
@@ -693,8 +819,12 @@ sub update_access {
}
&close_form($r,$url,$group);
} else {
+ my $group_arg;
+ if ($group) {
+ $group_arg = '&group='.$group;
+ }
$r->print('
'.
+ '¤tpath='.$env{'form.currentpath'}.$group_arg.'">'.
&mt('Display all access settings for this file').'');
}
return;
@@ -845,11 +975,11 @@ 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:').' '.$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;
@@ -865,24 +995,25 @@ 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(' | | ');
- &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(' | ');
- if (@courses > 0 || @groups > 0) {
- $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(' | | ');
+ #if (@courses > 0 || @groups > 0) {
+ # $r->print('| ');
+ #} else {
+ # $r->print(' | ');
+ #}
+ #&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(' |
');
}
@@ -922,7 +1053,6 @@ sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
if (@{$items} > 0) {
my @all_doms;
- my $tablecolor;
my $colspan = 3;
my $uctype = $type;
$uctype =~ s/^(\w)/uc($1)/e;
@@ -934,25 +1064,22 @@ sub display_access_row {
$r->print(' | '.&mt('Allowed [_1] member affiliations',$type).
' | ');
$colspan ++;
- my $function = &Apache::loncommon::get_users_function();
- $tablecolor=&Apache::loncommon::designparm($function.'.tabbg');
} elsif ($type eq 'domains') {
@all_doms = &Apache::loncommon::get_domains();
}
$r->print(&Apache::loncommon::end_data_table_header_row());
- $r->print(&Apache::loncommon::start_data_table_row());
foreach my $key (@{$items}) {
+ $r->print(&Apache::loncommon::start_data_table_row());
if (($type eq 'course') || ($type eq 'group')) {
- &course_row($r,$status,$type,$key,$access_controls,
- $tablecolor,$now,$then);
+ &course_row($r,$status,$type,$key,$access_controls,$now,$then);
} elsif ($type eq 'domains') {
&domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
$then);
} elsif ($type eq 'users') {
&users_row($r,$status,$key,$access_controls,$now,$then);
}
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table_row());
if ($status eq 'old') {
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(''.&additional_item($type).
@@ -1011,11 +1138,12 @@ function getIndex(name,value) {
}
sub course_row {
- my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
- my %content;
+ my ($r,$status,$type,$item,$access_controls,$now,$then) = @_;
+ my $content;
my $defdom = $env{'user.domain'};
if ($status eq 'old') {
- $defdom = $$access_controls{$item}{'domain'};
+ $content = $$access_controls{$item};
+ $defdom = $content->{'domain'};
}
my $js = &Apache::loncommon::coursebrowser_javascript($defdom)
.&course_js();
@@ -1023,34 +1151,34 @@ sub course_row {
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).' | ');
if ($status eq 'old') {
- my $cid = $content{'domain'}.'_'.$content{'number'};
+ my $cid = $content->{'domain'}.'_'.$content->{'number'};
my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print(''.$course_description{'description'}.' | ');
+ $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('');
+ $r->print('');
$r->print('| '.&mt('Action').' | '.&mt('Roles').' | '.
&mt('Access').' | '.&mt('Sections').' | '.
&mt($crsgrptext).' | ');
if ($status eq 'old') {
my $max_id = 0;
- foreach my $role_id (sort(keys(%{$content{'roles'}}))) {
+ foreach my $role_id (sort(keys(%{$content->{'roles'}}))) {
if ($role_id > $max_id) {
$max_id = $role_id;
}
$max_id ++;
- my $role_selects = &role_selectors($num,$role_id,$status,$type,\%content,'display');
+ my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');
$r->print('
| '.$role_selects.' ');
}
- $r->print('
'.&mt('Add a roles-based condition').' | ');
+ $r->print('
'.&mt('Add a roles-based condition').' {'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" /> | ');
} elsif ($status eq 'new') {
my $role_id = 1;
my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
@@ -1176,8 +1304,10 @@ sub role_selectors {
$cdom = $env{'form.cdom'};
$cnum = $env{'form.cnum'};
}
+ my $uctype = $type;
+ $uctype =~ s/^(\w)/uc($1)/e;
my ($sections,$groups,$allroles,$rolehash,$accesshash) =
- &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$type);
+ &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype);
if (!@{$sections}) {
@{$sections} = ('none');
} else {
@@ -1235,6 +1365,10 @@ sub role_options_window {
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('