--- loncom/interface/portfolio.pm 2006/03/15 19:41:26 1.95 +++ loncom/interface/portfolio.pm 2006/06/22 15:42:38 1.110 @@ -30,6 +30,9 @@ use Apache::lontexconvert; use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonnet; +use Apache::longroup; +use lib '/home/httpd/lib/perl'; +use LONCAPA; # receives a file name and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath @@ -123,12 +126,16 @@ sub display_directory { my $checked_files; my $port_path = &get_port_path($group); my ($uname,$udom) = &get_name_dom($group); - my $namespace = &get_namespace($group); if (defined($group)) { $groupitem = ''; $groupecho = '&group='.$group; } - my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname); + my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, + $uname); + my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash( + $current_permissions,$group); + my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group); + my $now = time; if ($env{"form.mode"} eq 'selectfile'){ &select_files($r); $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); @@ -151,7 +158,7 @@ sub display_directory { $r->print('
'); } else { $r->print(''. - ''); + ''); $r->print(''); } if (defined($group)) { @@ -159,6 +166,8 @@ sub display_directory { } my $href_location="/uploaded/$udom/$uname/$port_path".$current_path; my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path; + my @dir_lines; + my %versioned; foreach my $line (sort { my ($afile)=split('&',$a,2); @@ -169,6 +178,15 @@ sub display_directory { #$dom my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); $filename =~ s/\s+$//; + my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + if ($version) { + $versioned{$fname} .= $version.","; + } + push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); + } + foreach my $line (@dir_lines) { + my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line; + my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { if ($dirptr&$testdir) { if ($select_mode eq 'true'){ @@ -181,14 +199,22 @@ sub display_directory { $r->print(''); } else { $r->print(''); + my $version_flag; + if (exists($versioned{$fname})) { + $version_flag = "*"; + } else { + $version_flag = ""; + } + my $fullpath = $current_path.$filename; + $fullpath = &prepend_group($fullpath,$group); if ($select_mode eq 'true'){ - $r->print(''); } else { - if (exists $locked_files{$current_path.$filename}){ + if (exists $locked_files{$fullpath}) { $r->print(''); } else { my $cat=''.&mt('Catalog Information').
@@ -199,11 +225,46 @@ sub display_directory {
                             </td>');
                     }
                 }
+                my $curr_access;
+                my $pub_access = 0;
+                my $guest_access = 0;
+                my $cond_access = 0;
+                foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
+                    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 && !$guest_access && !$cond_access) {
+                    $curr_access = &mt('Private');
+                } else {
+                    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('<td><img src='); $r->print(''); $r->print(''); $r->print(''); + $r->print(''); $r->print(''); } } @@ -229,7 +290,7 @@ sub display_directory { sub open_form { my ($r,$url)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); - $r->print(''); + $r->print(''); $r->print(''); $r->print(''); @@ -242,8 +303,14 @@ 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".''); @@ -257,7 +324,7 @@ sub close_form { $r->print("\n".''); } - $r->print("\n".' + $r->print("\n".'

'); } @@ -298,6 +365,7 @@ sub delete { my ($r,$url,$group)=@_; my @check; my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'}; + $file_name = &prepend_group($file_name,$group); my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my ($uname,$udom) = &get_name_dom($group); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { @@ -373,6 +441,7 @@ sub rename { my ($r,$url,$group)=@_; 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)); @@ -410,8 +479,786 @@ sub rename_confirmed { } $r->print(&done(undef,$url,$group)); } + +sub display_access { + my ($r,$url,$group) = @_; + 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.').'
'); + &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); +} + +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 control(s) added', + 'delete' => 'Existing control(s) deleted', + 'update' => 'Existing control(s) modified', + ); + my $changes; + foreach my $chg (sort(keys(%title))) { + @{$processing{$chg}} = &Apache::loncommon::get_env_multiple('form.'.$chg); + $totalprocessed += @{$processing{$chg}}; + foreach my $num (@{$processing{$chg}}) { + my $scope = $env{'form.scope_'.$num}; + my ($start,$end) = &get_dates_from_form($num); + my $newkey = $num.':'.$scope.'_'.$end.'_'.$start; + if ($chg eq 'delete') { + $$changes{$chg}{$newkey} = 1; + } else { + $$changes{$chg}{$newkey} = + &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"); + $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); + } + 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_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') { + if (!($deloutcome eq 'ok')) { + $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome); + next; + } + } + my $numchgs = @{$processing{$chg}}; + $r->print(&Apache::loncommon::start_data_table_row()); + $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) = &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(''); + 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()); + $r->print(&Apache::loncommon::start_data_table_row()); + if ($status eq 'old') { + $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 Modified
Actions NameSizeLast ModifiedCurrent Access Status
print('print("CHECKED"); } $r->print('>Locked'. $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''.&mt($curr_access).'   '. + ''.&mt('View/Change').'
'.&mt('Type of change').''. + &mt('Access control').''.&mt('Dates available'). + ''.&mt('Additional information').''.&mt($title{$chg}). + '.'.&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 ++; + } + } + } + $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); + } + } + if ($errors) { + $r->print($errors); + } + } + 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,$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; +} + +sub get_dates_from_form { + my ($id) = @_; + my $startdate; + my $enddate; + $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$id); + $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$id); + if ( exists ($env{'form.noend_'.$id}) ) { + $enddate = 0; + } + 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'); + my ($guest,$guesttext); + $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}))) { + ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key); + if ($scope eq 'public') { + $public = $key; + $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()); + if ($public) { + $r->print(''); + } else { + $r->print(''); + } + $r->print(&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::end_data_table()); + $r->print(''); + $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(''); + } else { + $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(''); + 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').''.&actionbox('old',$publicnum,'public').''. + &dateboxes($publicnum,$start{$public},$end{$public}).''.&actionbox('new','0','public').''. + &dateboxes('0',$now,$then).' '); + $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').''.&actionbox('old',$guestnum,'guest').''. + &dateboxes($guestnum,$start{$guest},$end{$guest}).''.&actionbox('new','1','guest').''. + &dateboxes('1',$now,$then).'
 
'); + &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 = ''.&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 { - my ($r,$group)=@_; + my ($r,$group) = @_; if ($env{'form.continue'} eq 'true') { # here we update the selections for the currentpath # eventually, have to handle removing those not checked, but . . . @@ -476,8 +1323,13 @@ sub upload { foreach my $line (@dir_list) { my ($file_name)=split(/\&/,$line,2); if ($file_name eq $fname){ + $file_name = $env{'form.currentpath'}.$file_name; + $file_name = &prepend_group($file_name,$group); $found_file = 1; - if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$udom,$uname) eq 'true') { + if (defined($group)) { + $file_name = $group.'/'.$file_name; + } + if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { $locked_file = 1; } } @@ -501,7 +1353,6 @@ sub upload { } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', $port_path.$env{'form.currentpath'}); - print STDERR "result was $result for $port_path.$env{'form.currentpath'}\n"; if ($result !~ m|^/uploaded/|) { $r->print(' An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); @@ -514,21 +1365,31 @@ sub upload { sub lock_info { my ($r,$url,$group) = @_; my ($uname,$udom) = &get_name_dom($group); - my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname); + my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, + $uname); my $file_name = $env{'form.lockinfo'}; - foreach my $key(keys(%current_permissions)) { - if ($file_name eq $key) { - foreach my $array_item (@{$current_permissions{$key}}) { - if (ref($array_item)) { - $r->print(''.$key.' was submitted in response to problem: '. - &Apache::lonnet::gettitle($$array_item[0]).'
'); - my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); - $r->print('In the course: '.$course_description{'description'}.'
'); - # $r->print('the third is '.$$array_item[2].'
'); - # $r->print("item is $$array_item[0]
and $$array_item[0]"); - } + $file_name = &prepend_group($file_name,$group); + if (defined($file_name) && defined($$current_permissions{$file_name})) { + foreach my $array_item (@{$$current_permissions{$file_name}}) { + if (ref($array_item) eq 'ARRAY') { + my $filetext; + if (defined($group)) { + $filetext = ''.$env{'form.lockinfo'}. + ' (group: '.$group.')'; + } else { + $filetext = ''.$file_name.''; + } + $r->print(&mt('[_1] was submitted in response to problem: ', + $filetext). + ''.&Apache::lonnet::gettitle($$array_item[0]). + '
'); + my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); + $r->print(&mt('In the course: [_1]
', + $course_description{'description'})); + # $r->print('the third is '.$$array_item[2].'
'); + # $r->print("item is $$array_item[0]
and $$array_item[0]"); } - } + } } $r->print(&done('Back',$url,$group)); return 'ok'; @@ -603,6 +1464,14 @@ sub get_name_dom { return ($uname,$udom); } +sub prepend_group { + my ($filename,$group) = @_; + if (defined($group)) { + $filename = $group.'/'.$filename; + } + return $filename; +} + sub get_namespace { my ($group) = @_; my $namespace = 'portfolio'; @@ -628,8 +1497,9 @@ sub handler { # this handles file management my $r = shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selectfile','currentpath','meta','lockinfo','currentfile', - 'action','fieldname','mode','rename','continue','group']); + ['selectfile','currentpath','meta','lockinfo','currentfile','action', + 'fieldname','mode','rename','continue','group','access','setnum', + 'cnum','cdom','type','setroles']); my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; @@ -649,10 +1519,10 @@ sub handler { $group = $env{'form.group'}; $group =~ s/\W//g; if ($group) { - my %curr_groups = (); ($uname,$udom) = &get_name_dom($group); - if (&Apache::loncommon::coursegroups(\%curr_groups,$udom,$uname, - $group)) { + my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, + $group); + if (%curr_groups) { if (($view_permission) || (&Apache::lonnet::allowed('rgf', $env{'request.course.id'}.'/'.$group))) { $portfolio_root = &get_portfolio_root($group); @@ -680,12 +1550,14 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.&Apache::loncommon::head($title)."\n"); if ($env{"form.mode"} eq 'selectfile'){ - $r->print(&Apache::loncommon::bodytag($title,undef,undef,1)); + $r->print(&Apache::loncommon::start_page($title,undef, + {'only_body' => 1})); + } elsif ($env{'form.action'} eq 'rolepicker') { + $r->print(&Apache::loncommon::start_page('New role-based condition',undef, + {'no_nav_bar' => 1, })); } else { - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); } $r->rflush(); if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ @@ -718,6 +1590,14 @@ sub handler { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; &rename($r,$url,$group); + } elsif ($env{'form.access'}) { + $env{'form.selectfile'} = $env{'form.access'}; + $env{'form.action'} = 'chgaccess'; + &display_access($r,$url,$group); + } elsif ($env{'form.action'} eq 'chgaccess') { + &update_access($r,$url,$group); + } elsif ($env{'form.action'} eq 'rolepicker') { + &role_options_window($r); } elsif ($env{'form.createdir'}) { &createdir($r,$url,$group); } elsif ($env{'form.lockinfo'}) { @@ -733,7 +1613,8 @@ sub handler { # 1) never been here, so directory structure not created # 2) back-button navigation after deleting a directory if ($current_path eq '/'){ - &Apache::lonnet::mkdiruserfile($uname,$udom,'portfolio'); + &Apache::lonnet::mkdiruserfile($uname,$udom, + &get_port_path($group)); } else { # some directory that snuck in get rid of the directory # from the recent pulldown, just in case