--- loncom/interface/portfolio.pm 2006/06/20 03:02:33 1.106 +++ loncom/interface/portfolio.pm 2006/06/22 16:51:00 1.113 @@ -31,7 +31,7 @@ use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonnet; use Apache::longroup; -use lib '/home/httpd/lib/perl'; +use HTML::Entities; use LONCAPA; # receives a file name and path stub from username/userfiles/portfolio/ @@ -40,9 +40,9 @@ sub make_anchor { 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; @@ -63,38 +63,39 @@ sub display_common { 'createdir' => 'Create Subdirectory', 'createdir_label' => 'Create subdirectory in current directory:'); + my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); $r->print(<<"TABLE"); - - - - + + - - - - - - + + + + - - + + +
- $text{'upload_label'} - $groupitem +
+ $text{'upload_label'} + $groupitem + -
- $text{'createdir_label'} - + +
+ $text{'createdir_label'} + +
$groupitem -
TABLE my @tree = split (/\//,$current_path); @@ -108,9 +109,9 @@ TABLE } $r->print(''); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', @@ -153,13 +154,13 @@ sub display_directory { return; } if ($select_mode eq 'true') { + $r->print(''); $r->print(''. ''); - $r->print(''); } else { + $r->print(''); $r->print('
Select NameSizeLast Modified
'. ''); - $r->print(''); } if (defined($group)) { $r->print("\n".$groupitem."\n"); @@ -190,9 +191,9 @@ sub display_directory { if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { if ($dirptr&$testdir) { if ($select_mode eq 'true'){ - $r->print(''); + $r->print(''); } else { - $r->print(''); + $r->print(''); } $r->print(''); $r->print(''); @@ -227,28 +228,44 @@ sub display_directory { } my $curr_access; my $pub_access = 0; + my $guest_access = 0; + my $cond_access = 0; foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) { - my ($scope,$end,$start) = ($key =~ /^[^:]+:([a-z]+)_(\d*)_?(\d*)$/); + my ($num,$scope,$end,$start) = &unpack_acc_key($key); if (($now > $start) && (!$end || $end > $now)) { if ($scope eq 'public') { $pub_access = 1; + } elsif ($scope eq 'guest') { + $guest_access = 1; + } else { + $cond_access = 1; } } } - if (!$pub_access) { - $curr_access = 'Private' + if (!$pub_access && !$guest_access && !$cond_access) { + $curr_access = &mt('Private'); } else { - $curr_access = 'Public'; + my @allaccesses; + if ($pub_access) { + push(@allaccesses,&mt('Public')); + } + if ($guest_access) { + push(@allaccesses,&mt('Password-protected')); + } + if ($cond_access) { + push(@allaccesses,&mt('Conditional')); + } + $curr_access = join('+ ',@allaccesses); } - $r->print(''); + $r->print(''); $r->print(''); $r->print(''); $r->print(''); - $r->print(''); + '">'.&mt('View/Change').''); $r->print(''); } } @@ -287,14 +304,20 @@ 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".''); } $r->print('

'); - $r->print(' + $r->print('

'); @@ -302,7 +325,7 @@ sub close_form { $r->print("\n".''); } - $r->print("\n".' + $r->print("\n".'

'); } @@ -468,21 +491,27 @@ sub display_access { 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.').'

'); + $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.').'
'); &access_setting_table($r,$access_controls{$file_name}); - &close_form($r,$url,$group); + my $button_text = { + 'continue' => &mt('Proceed'), + 'cancel' => &mt('Back to directory listing'), + }; + &close_form($r,$url,$group,$button_text); } 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 = ( - '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,29 +523,36 @@ 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('

'.&mt('Allowing others to retrieve portfolio file: [_1]',$file_name).'

'."\n"); + $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); my ($errors,$outcome,$deloutcome,$new_values,$translation); if ($totalprocessed) { ($outcome,$deloutcome,$new_values,$translation) = - &Apache::lonnet::modify_access_controls($file_name,$changes,$udom,$uname); + &Apache::lonnet::modify_access_controls($file_name,$changes,$udom, + $uname); } - my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); - my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$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); if ($totalprocessed) { if ($outcome eq 'ok') { my $updated_controls = $access_controls{$file_name}; my ($showstart,$showend); $r->print(&Apache::loncommon::start_data_table()); - $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(''); - $r->print(&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''); + $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $chg (sort(keys(%processing))) { if (@{$processing{$chg}} > 0) { if ($chg eq 'delete') { @@ -527,20 +563,19 @@ sub update_access { } my $numchgs = @{$processing{$chg}}; $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(''); + $r->print(''); my $count = 0; foreach my $key (sort(keys(%{$$changes{$chg}}))) { if ($count) { $r->print(&Apache::loncommon::start_data_table_row()); } - my ($num,$scope,$end,$start) = - ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/); + my ($num,$scope,$end,$start) = &unpack_acc_key($key); my $newkey = $key; if ($chg eq 'activate') { $newkey =~ s/^(\d+)/$$translation{$1}/; } - my %content = &Apache::lonnet::parse_access_controls( - $$updated_controls{$newkey}); + my $content = $$updated_controls{$newkey}; if ($chg eq 'delete') { $showstart = &mt('Deleted'); $showend = $showstart; @@ -552,8 +587,70 @@ sub update_access { $showend = localtime($end); } } - $r->print(''); + $r->print(''); + if (($type eq 'course') || ($type eq 'group')) { + $r->print(''); + $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}) { + if (($type eq 'course') || ($type eq 'group')) { + &course_row($r,$status,$type,$key,$access_controls, + $tablecolor,$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()); + if ($status eq 'old') { + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(''); + $r->print(&Apache::loncommon::end_data_table_row()); + } + $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&mt('No [_1]-based conditions defined.
',$type). + &additional_item($type)); + } + return; +} + +sub course_js { + return qq| + +|; +} + +sub course_row { + my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_; + my %content; + my $defdom = $env{'user.domain'}; + if ($status eq 'old') { + $defdom = $$access_controls{$item}{'domain'}; + } + my $js = &Apache::loncommon::coursebrowser_javascript($defdom) + .&course_js(); + my $crsgrptext = 'Groups'; + if ($type eq 'group') { + $crsgrptext = 'Teams'; + } + my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, + $type); + $r->print(''); + if ($status eq 'old') { + my $cid = $content{'domain'}.'_'.$content{'number'}; + my %course_description = &Apache::lonnet::coursedescription($cid); + $r->print(''); + } elsif ($status eq 'new') { + my $uctype = $type; + $uctype =~ s/^(\w)/uc($1)/e; + $r->print(''); + } + $r->print(''); + $r->print(''); + } elsif ($status eq 'new') { + my $role_id = 1; + my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display'); + $r->print(''.$role_selects); + $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
'.&mt('open folder').'
'.&mt('closed folder').'Go to ...'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''. $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''.&mt($curr_access).'   '. + $r->print(''.&mt($curr_access).'   '. ''.&mt('View/Change').'
'.&mt('Type of change').''.&mt('Access control').''.&mt('Start date').''.&mt('End date').''.&mt('Type of change').''. + &mt('Access control').''.&mt('Dates available'). + ''.&mt('Additional information').''.&mt($title{$chg}).'.'.&mt($title{$chg}). + '.'.&mt($scope).''.$showstart. - ''. $showend.''.&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(''); + if ($scope eq 'course') { + $r->print(''); + } else { + $r->print(''); + } + $r->print(''); + foreach my $id (sort(keys(%{$content->{'roles'}}))) { + $r->print(''); + foreach my $item ('role','access','section','group') { + $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 ++; } @@ -569,14 +666,109 @@ sub update_access { $r->print($errors); } } - $r->print('
'.&mt('Display all access settings for this file').''); + my $allnew = 0; + my $totalnew = 0; + my $status = 'new'; + my ($firstitem,$lastitem); + foreach my $newitem ('course','group','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') { + 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; + $lastitem = $totalnew + $env{'form.new'.$newitem}; + $totalnew = $lastitem; + my @numbers; + for (my $i=$firstitem; $i<$lastitem; $i++) { + push (@numbers,$i); + } + &display_access_row($r,$status,$newitem,\@numbers, + $access_controls{$file_name},$now,$then); + } + } + &close_form($r,$url,$group); + } else { + $r->print('
'. + &mt('Display all access settings for this file').''); + } return; } sub build_access_record { - my ($num,$scope,$start,$end) = @_; - my $record = ''.$start.''.$end. - ''; + my ($num,$scope,$start,$end,$chg) = @_; + my $record = { + type => $scope, + time => { + start => $start, + end => $end + }, + }; + + if ($scope eq 'guest') { + $record->{'password'} = $env{'form.password'}; + } elsif (($scope eq 'course') || ($scope eq 'group')) { + $record->{'domain'} = $env{'form.crsdom_'.$num}; + $record->{'number'} = $env{'form.crsnum_'.$num}; + my @role_ids; + my @delete_role_ids = + &Apache::loncommon::get_env_multiple('form.delete_role_'.$num); + my @preserves = + &Apache::loncommon::get_env_multiple('form.preserve_role_'.$num); + if (@delete_role_ids) { + foreach my $id (@preserves) { + if (grep {$_ = $id} (@delete_role_ids)) { + next; + } + push(@role_ids,$id); + } + } else { + push(@role_ids,@preserves); + } + + my $next_id = $env{'form.add_role_'.$num}; + if ($next_id) { + push(@role_ids,$next_id); + } + + foreach my $id (@role_ids) { + my (@roles,@accesses,@sections,@groups); + if (($id == $next_id) && ($chg eq 'update')) { + @roles = split(/,/,$env{'form.role_'.$num.'_'.$next_id}); + @accesses = split(/,/,$env{'form.access_'.$num.'_'.$next_id}); + @sections = split(/,/,$env{'form.section_'.$num.'_'.$next_id}); + @groups = split(/,/,$env{'form.group_'.$num.'_'.$next_id}); + } else { + @roles = &Apache::loncommon::get_env_multiple('form.role_'.$num.'_'.$id); + @accesses = &Apache::loncommon::get_env_multiple('form.access_'.$num.'_'.$id); + @sections = &Apache::loncommon::get_env_multiple('form.section_'.$num.'_'.$id); + @groups = &Apache::loncommon::get_env_multiple('form.group_'.$num.'_'.$id); + } + $record->{'roles'}{$id}{'role'} = \@roles; + $record->{'roles'}{$id}{'access'} = \@accesses; + $record->{'roles'}{$id}{'section'} = \@sections; + $record->{'roles'}{$id}{'group'} = \@groups; + } + } elsif ($scope eq 'domains') { + my @doms = &Apache::loncommon::get_env_multiple('form.dom_'.$num); + $record->{'dom'} = \@doms; + } elsif ($scope eq 'users') { + my $userlist = $env{'form.users_'.$num}; + $userlist =~ s/\s+//sg; + my %userhash = map { ($_,1) } (split(/,/,$userlist)); + foreach my $user (keys(%userhash)) { + my ($uname,$udom) = split(/:/,$user); + push(@{$record->{'users'}}, { + 'uname' => $uname, + 'udom' => $udom + }); + } + } return $record; } @@ -592,75 +784,479 @@ sub get_dates_from_form { return ($startdate,$enddate); } +sub sort_users { + my ($users) = @_; + my @curr_users = map { + $_->{'uname'}.':'.$_->{'udom'} + } (@{$users}); + my $curr_user_list = join(",\n",sort(@curr_users)); + return $curr_user_list; +} + sub access_setting_table { my ($r,$access_controls) = @_; my ($public,$publictext); - $publictext = ''.&mt('Off').''; + $publictext = &mt('Off'); my ($guest,$guesttext); - $guesttext = ''.&mt('Off').''; + $guesttext = &mt('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); foreach my $key (sort(keys(%{$access_controls}))) { - my ($scope) = ($key =~ /^[^:]+:([a-z]+)_\d*_?\d*$/); + ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key); if ($scope eq 'public') { $public = $key; - $publictext = ''.&mt('On').''; + $publicnum = $num; + $publictext = &acl_status($start{$key},$end{$key},$now); + } elsif ($scope eq 'guest') { + $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); } + $acl_count{$scope} ++; } + $r->print('
'.&mt('Roles').''. + &mt('Access').''. + &mt('Sections').''.&mt('Groups').''.&mt('Teams').'
'); + 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_header_row()); $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(''."\n"); + if ($public) { + $r->print(''); + } else { + $r->print(''); + } $r->print(&Apache::loncommon::end_data_table_row()); - $r->print(&Apache::loncommon::start_data_table_row()); - $r->print(''); + $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 = ''; - $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(''); + } else { + $r->print(''); } - $r->print(''); + $r->print(''); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); + $r->print(''); + if (@courses > 0 || @groups > 0) { + $r->print(''); - $r->print(&Apache::loncommon::end_data_table_row()); - $r->print(&Apache::loncommon::end_data_table()); + if (@courses > 0 || @groups > 0) { + $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').''.&mt('Access Type').''. - &mt('Settings').''.&actionbox('old',$publicnum,'public').''. + &dateboxes($publicnum,$start{$public},$end{$public}).''.&actionbox('new','0','public').''. + &dateboxes('0',$now,$then).'Public
'.$publictext.'
'); + $r->print(&Apache::loncommon::end_data_table()); + $r->print(' '); + $r->print('

'.&mt('Password-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('Delete').'
'.&mt('Update'). - '
'.&actionbox('old',$guestnum,'guest').''. + &dateboxes($guestnum,$start{$guest},$end{$guest}).''.&actionbox('new','1','guest').''. + &dateboxes('1',$now,$then).''.$pub_action.''.&mt('Start: ').$pub_startdate. - '
'.&mt('End: ').$pub_enddate.'
 
'); + &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('
'); + } else { + $r->print(''); + } + &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); $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('

'.&mt('[_1]-based conditional access: ',$title)); + if ($$acl_count{$type}) { + $r->print($$acl_count{$type}.' '); + if ($$acl_count{$type} > 1) { + $r->print(&mt('conditions')); + } else { + $r->print(&mt('condition')); + } + } else { + $r->print(&mt('Off')); + } + $r->print('

'); + &display_access_row($r,'old',$type,$items,$access_controls,$now,$then); + return; +} + +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; + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print('
'.&mt('Action?').''.&mt($uctype).''. + &mt('Dates available').''.&mt('Allowed [_1] member affiliations',$type). + ''.&additional_item($type). + ''.$js.&actionbox($status,$num,$scope).''.$course_description{'description'}.''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).'  '.&dateboxes($num,$start,$end).''); + $r->print(''); + if ($status eq 'old') { + my $max_id = 0; + 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'); + $r->print(''.$role_selects.''); + } + $r->print('
'.&mt('Action').''.&mt('Roles').''. + &mt('Access').''.&mt('Sections').''. + &mt($crsgrptext).'


'.&mt('Add a roles-based condition').' 
'.&mt('Add').'
'); + } + return; +} + +sub domains_row { + my ($r,$status,$item,$all_doms,$access_controls,$now,$then) = @_; + my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, + 'domains'); + my $dom_select = ''; + $r->print(''.&actionbox($status,$num,$scope).''.$dom_select. + ''.&dateboxes($num,$start,$end).''); +} + +sub users_row { + my ($r,$status,$item,$access_controls,$now,$then) = @_; + my ($num,$scope,$end,$start) = &set_identifiers($status,$item,$now,$then, + 'users'); + my $curr_user_list; + if ($status eq 'old') { + my $content = $$access_controls{$item}; + $curr_user_list = &sort_users($content->{'users'}); + } + $r->print(''.&actionbox($status,$num,$scope).''.&mt("Format for users' username:domain information:").'
sparty:msu,illini:uiuc ... etc.
'.&dateboxes($num,$start,$end).''); +} + +sub additional_item { + my ($type) = @_; + my $output = &mt('Add new [_1] condition(s)?',$type).' '.&mt('Number to add: ').''; + return $output; +} + +sub actionbox { + my ($status,$num,$scope) = @_; + my $output = '
'. + ''; + return $output; +} + +sub dateboxes { + my ($num,$start,$end) = @_; + my $noend; + if ($end == 0) { + $noend = 'checked="checked"'; + } + my $startdate = &Apache::lonhtmlcommon::date_setter('portform', + 'startdate_'.$num,$start,undef,undef,undef,1,undef, + undef,undef,1); + my $enddate = &Apache::lonhtmlcommon::date_setter('portform', + 'enddate_'.$num,$end,undef,undef,undef,1,undef, + undef,undef,1). '  '; + + my $output = &mt('Start: ').$startdate.'
'.&mt('End: ').$enddate; + return $output; +} + +sub unpack_acc_key { + my ($acc_key) = @_; + my ($num,$scope,$end,$start) = ($acc_key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/); + return ($num,$scope,$end,$start); +} + +sub set_identifiers { + my ($status,$item,$now,$then,$scope) = @_; + if ($status eq 'old') { + return(&unpack_acc_key($item)); + } else { + return($item,$scope,$then,$now); + } +} + +sub role_selectors { + my ($num,$role_id,$status,$type,$content,$caller) = @_; + my ($output,$cdom,$cnum,$longid); + if ($caller eq 'display') { + $longid = '_'.$num.'_'.$role_id; + if ($status eq 'new') { + foreach my $item ('role','access','section','group') { + $output .= ''; + } + return $output; + } else { + $cdom = $$content{'domain'}; + $cnum = $$content{'number'}; + } + } elsif ($caller eq 'rolepicker') { + $cdom = $env{'form.cdom'}; + $cnum = $env{'form.cnum'}; + } + my ($sections,$groups,$allroles,$rolehash,$accesshash) = + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$type); + if (!@{$sections}) { + @{$sections} = ('none'); + } else { + unshift(@{$sections},('all','none')); + } + if (!@{$groups}) { + @{$groups} = ('none'); + } else { + unshift(@{$groups},('all','none')); + } + my @allacesses = sort(keys(%{$accesshash})); + my (%sectionhash,%grouphash); + foreach my $sec (@{$sections}) { + $sectionhash{$sec} = $sec; + } + foreach my $grp (@{$groups}) { + $grouphash{$grp} = $grp; + } + my %lookup = ( + 'role' => $rolehash, + 'access' => $accesshash, + 'section' => \%sectionhash, + 'group' => \%grouphash, + ); + my @allaccesses = sort(keys(%{$accesshash})); + my %allitems = ( + 'role' => $allroles, + 'access' => \@allaccesses, + 'section' => $sections, + 'group' => $groups, + ); + foreach my $item ('role','access','section','group') { + $output .= ''; + } + $output .= ''; + 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 $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('
'.$role_selects.'
'.&mt('Roles').''.&mt('[_1] status',$type).''.&mt('Sections').''.&mt('Groups').'

'); + return; } sub select_files { @@ -682,7 +1278,7 @@ sub select_files { $java_files.=','; } my $javascript =(< +