--- loncom/interface/portfolio.pm 2006/03/03 23:27:25 1.94 +++ loncom/interface/portfolio.pm 2006/06/16 22:37:10 1.104 @@ -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)) { @@ -181,14 +188,16 @@ sub display_directory { $r->print(''); } else { $r->print(''); + 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 +208,30 @@ sub display_directory { </td>'); } } + my $curr_access; + my $pub_access = 0; + foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) { + my ($scope,$end,$start) = ($key =~ /^[^:]+:([a-z]+)_(\d*)_?(\d*)$/); + if (($now > $start) && (!$end || $end > $now)) { + if ($scope eq 'public') { + $pub_access = 1; + } + } + } + if (!$pub_access) { + $curr_access = 'Private' + } else { + $curr_access = 'Public'; + } $r->print('<td><img src='); $r->print(''); $r->print(''); $r->print(''); + $r->print(''); $r->print(''); } } @@ -229,7 +257,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(''); @@ -298,6 +326,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 +402,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 +440,214 @@ 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 the following types: public.').'

'); + &access_setting_table($r,$access_controls{$file_name}); + &close_form($r,$url,$group); +} + +sub update_access { + my ($r,$url,$group) = @_; + my $totalprocessed = 0; + my %processing; + my %title = ( + 'activate' => 'New controls added', + 'delete' => 'Existing controls deleted', + 'update' => 'Existing controls 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); + } + } + } + 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_row()); + $r->print(''); + $r->print(&Apache::loncommon::end_data_table_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) = + ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/); + my $newkey = $key; + if ($chg eq 'activate') { + $newkey =~ s/^(\d+)/$$translation{$1}/; + } + my %content = &Apache::lonnet::parse_access_controls( + $$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(''); + $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); + } + } + $r->print('
'.&mt('Display all access settings for this file').''); + return; +} + +sub build_access_record { + my ($num,$scope,$start,$end) = @_; + my $record = ''.$start.''.$end. + ''; + 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 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. + foreach my $key (sort(keys(%{$access_controls}))) { + my ($scope) = ($key =~ /^[^:]+:([a-z]+)_\d*_?\d*$/); + if ($scope eq 'public') { + $public = $key; + $publictext = ''.&mt('On').''; + } + } + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(''."\n"); + $r->print(&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(''; + $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'). + ''; + + } + $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_row()); + $r->print(&Apache::loncommon::end_data_table()); +} + 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 +712,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 +742,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 +754,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 +853,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'; @@ -629,7 +887,7 @@ sub handler { my $r = shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['selectfile','currentpath','meta','lockinfo','currentfile', - 'action','fieldname','mode','rename','continue','group']); + 'action','fieldname','mode','rename','continue','group','access']); my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; @@ -649,10 +907,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 +938,11 @@ 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.''.$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})); } 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 +975,12 @@ 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.createdir'}) { &createdir($r,$url,$group); } elsif ($env{'form.lockinfo'}) { @@ -733,7 +996,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 @@ -749,7 +1013,7 @@ sub handler { my $is_empty=(@dir_list == 2); &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group); &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group); - $r->print("\n\n"); + $r->print(&Apache::loncommon::end_page()); } return OK; }
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('Start date').''.&mt('End date').''.&mt($title{$chg}).'.'.&mt($scope).''.$showstart. + ''. $showend.''.&mt('Access Type').''. + &mt('Settings').'Public
'.$publictext.'		'); + $r->print(&Apache::loncommon::start_data_table()); + $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_action.''.&mt('Start: ').$pub_startdate. + '
'.&mt('End: ').$pub_enddate.'