-
- $text{'upload_label'}
-
- $groupitem
+ my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
+ $r->print(<<"TABLE");
+
+
+
+ $text{'upload_label'}
+
+
+
-
-
-
+
+
+
TABLE
+ }
my @tree = split (/\//,$current_path);
- $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
+ $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
@@ -106,11 +116,11 @@ TABLE
$r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
}
}
- $r->print(' ');
+ $r->print('');
&Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
- $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 = (
@@ -556,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;
}
}
@@ -565,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(' '.&mt('Start: ').$showstart.
- ' ');
- 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) {
@@ -692,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;
@@ -844,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;
@@ -864,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('
');
}
@@ -921,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;
@@ -933,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).
@@ -1010,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();
@@ -1022,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(''.&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('