--- loncom/interface/portfolio.pm 2006/08/04 20:41:32 1.144 +++ loncom/interface/portfolio.pm 2006/11/05 21:08:53 1.170 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.144 2006/08/04 20:41:32 albertel Exp $ +# $Id: portfolio.pm,v 1.170 2006/11/05 21:08:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,12 +66,15 @@ sub group_form_data { # receives a file name and path stub from username/userfiles/portfolio/ # returns an anchor tag consisting encoding filename and currentpath sub make_anchor { - my ($url, $filename, $current_path, $current_mode, $field_name, - $continue_select) = @_; - if ($continue_select ne 'true') {$continue_select = 'false'}; - my $anchor = ''; + $anchor .= '">'.$inner_text.''; return $anchor; } @@ -92,6 +95,13 @@ sub display_common { 'createdir_label' => 'Create subdirectory in current directory:'); my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); + my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles'); + my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory'); + + # FIXME: This line should be deleted once Portfolio uses breadcrumbs + $r->print(&Apache::loncommon::help_open_topic('Portfolio About', 'Help on the portfolio')); + + $r->print(<<"TABLE"); @@ -106,7 +116,7 @@ sub display_common { - + $help_fileupload @@ -121,7 +131,7 @@ sub display_common { - + $help_createdir @@ -129,15 +139,30 @@ sub display_common { TABLE } my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/'); + my %anchor_fields = ( + 'selectfile' => $port_path, + 'currentpath' => '/', + 'mode' => $env{"form.mode"}, + 'fieldname' => $env{"form.fieldname"}, + 'continue' => $env{"form.continue"} + ); + $r->print(''.&make_anchor($url,\%anchor_fields,$port_path).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ $newCurrentPath .= $tree[$i].'/'; - $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/'); + my %anchor_fields = ( + 'selectfile' => $tree[$i], + 'currentpath' => '/', + 'mode' => $env{"form.mode"}, + 'fieldname' => $env{"form.fieldname"}, + 'continue' => $env{"form.continue"} + ); + $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/'); } } $r->print(''); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory')); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); $r->print('
'. @@ -147,23 +172,54 @@ TABLE } sub display_directory_line { - my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, + my ($r,$select_mode, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access, $now, $version_flag, $href_location, $url, $current_path, $access_admin_text, $versions)=@_; - # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + + my $fullpath = &prepend_group($current_path.$filename); $r->print('
'); - $r->print($line); - $r->print(''); - $r->print(''); + $r->print($line); # contains first two cells of table + my $lock_info; + if ($version_flag) { # versioned can't be versioned, so TRUE when root file + $r->print(''); + $r->print(''); + } else { # this is a graded or handed back file + my ($user,$domain) = &get_name_dom(); + my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user); + if (defined($$permissions_hash{$fullpath})) { + foreach my $array_item (@{$$permissions_hash{$fullpath}}) { + if (ref($array_item) eq 'ARRAY') { + if ($$array_item[-1] eq 'handback') { + $lock_info = 'Handback'; + } elsif ($$array_item[-1] eq 'graded') { + $lock_info = 'Graded'; + } + } + } + } + if ($lock_info) { + my %anchor_fields = ('lockinfo' => $fullpath); + if ($versions) { # hold the folder open + my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath); + $fname =~ s|^/||; + $anchor_fields{'showversions'} = $fname.'.'.$extension; + } + $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info); + } + $r->print(''); + } + # $r->print(''); $r->print(''); $r->print(''); if ($select_mode ne 'true') { $r->print(''); + my %anchor_fields = ( + 'access' => $filename, + 'currentpath' => $current_path + ); + $r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).''); } $r->print(''.$/); } @@ -188,7 +244,7 @@ sub display_directory { $current_permissions,$group); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group); my $now = time; - if ($env{"form.mode"} eq 'selectfile'){ + if ($env{"form.mode"} eq 'selectfile') { &select_files($r); $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); $select_mode = 'true'; @@ -208,18 +264,23 @@ sub display_directory { if ($select_mode eq 'true') { $r->print(''); $r->print('
'.$$version_flag{$filename}.''. - $filename.''.$version_flag.''.$lock_info.''.$$version_flag{$filename}.''); + $r->print(''.&make_anchor($href_location.$filename,undef,$filename).''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. &mt($curr_access).'   '); - $r->print(''.$access_admin_text.'
'. - ''); + ''); } else { $r->print(''); + $r->print(&Apache::loncommon::help_open_topic('Portfolio FileList', + 'Using the portfolio file list')); $r->print('
Select NameSizeLast Modified
Select  NameSizeLast Modified
'. - ''); + ''); } $r->print("\n".&group_form_data()."\n"); 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 @version_lines; my %versioned; foreach my $dir_line (sort { @@ -233,8 +294,9 @@ sub display_directory { $filename =~ s/\s+$//; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if ($version) { - push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); - $versioned{$fname.'.'.$extension} .= $version.","; + my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); + push(@{ $versioned{$fullpath} }, + [$filename,$dom,$testdir,$size,$mtime,$obs,]); } else { push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); } @@ -243,19 +305,33 @@ sub display_directory { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { - my %version_flag; + my $version_flag; my $show_versions; - if ($env{'form.showversions'} eq $filename) { + my $fullpath = &prepend_group($current_path.$filename); + if ($env{'form.showversions'} =~ /$filename/) { $show_versions = 'true'; } - if (exists($versioned{$filename})) { + if (exists($versioned{$fullpath})) { + my %anchor_fields = ( + 'selectfile' => $fullpath, + 'continue' => 'false', + 'currentpath' => $current_path, + ); if ($show_versions) { - $version_flag{$filename} = ''.&mt('opened folder').''; + # Must preserve other possible showversion files + my $version_remainder = $env{'form.showversions'}; + $version_remainder =~ s/$filename//g; + $anchor_fields{'showversions'} = $version_remainder; + $version_flag = &make_anchor('portfolio',\%anchor_fields, + ''.&mt('opened folder').''); } else { - $version_flag{$filename} = ''.&mt('closed folder').''; + # allow multiple files to show versioned + $anchor_fields{'showversions'} = $env{'form.showversions'}.','.$filename; + $version_flag = &make_anchor('portfolio',\%anchor_fields, + ''.&mt('closed folder').''); } } else { - $version_flag{$filename} = ''; + $version_flag = ' '; } if ($dirptr&$testdir) { my $colspan='colspan="2"'; @@ -264,13 +340,18 @@ sub display_directory { } $r->print(''); $r->print(''); - $r->print(''); + my %anchor_fields = ( + 'selectfile' => $filename.'/', + 'currentpath' => $current_path.$filename.'/', + 'mode' => $env{"form.mode"}, + 'fieldname' => $env{"form.fieldname"}, + 'continue' => $env{"form.continue"} + ); + $r->print(''); $r->print(''); } else { my $css_class = 'LC_browser_file'; my $line; - my $fullpath = $current_path.$filename; - $fullpath = &prepend_group($fullpath); if ($select_mode eq 'true') { $line=''; + my %anchor_fields = ( + 'lockinfo' => $fullpath + ); + $line.=''; $css_class= 'LC_browser_file_locked'; } else { if (!$can_modify) { @@ -291,10 +375,15 @@ sub display_directory { $line .= ''; } if ($can_modify) { - my $cat=''.&mt('Catalog Information').
+                            my $cat='<img class='; - $line .= 'Rename'; - $line .= ''; } @@ -332,19 +421,17 @@ sub display_directory { $curr_access = join('+ ',@allaccesses); } } - &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, - \%access_controls, $curr_access,$now, \%version_flag, $href_location, + &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line, + \%access_controls, $curr_access,$now, $version_flag, $href_location, $url, $current_path, $access_admin_text); if ($show_versions) { - foreach my $dir_line (@version_lines) { - my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line; - my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename); + foreach my $dir_line (@{ $versioned{$fullpath} }) { + my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = + @$dir_line; $line = ''; - if (($v_fname eq $fname)&&($v_extension eq $extension)) { - &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, - $css_class, $line, \%access_controls, $curr_access, $now, - \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1); - } + &display_directory_line($r,$select_mode, $v_filename, $mtime, $size, + $css_class, $line, \%access_controls, $curr_access, $now, + undef, $href_location, $url, $current_path, $access_admin_text, 1); } } } @@ -363,7 +450,8 @@ sub display_directory { $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
Actions  Name'. + &Apache::loncommon::help_open_topic('Portfolio OpenFile'). + 'SizeLast ModifiedCurrent Access Status'. + &Apache::loncommon::help_open_topic('Portfolio ShareFile'). + '
'.&mt('closed folder').'Go to ...'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/'.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').'
Locked'.&make_anchor($url,\%anchor_fields,'Locked').''.$version_flag{$filename}.''.$cat.''; + my %anchor_fields = ( + 'rename' => $filename, + currentpath => $current_path + ); + $line .= &make_anchor($url,\%anchor_fields,'Rename'); + $line .= ''.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat); + # ''.$cat.''; } $line .= ' 
'); if ($can_delete) { $r->print(' - + '. + &Apache::loncommon::help_open_topic('Portfolio DeleteFile').' ' @@ -432,12 +520,13 @@ sub done { unless (defined $message) { $message='Done'; } - my $result = '

'.&mt($message).'

'; + my %anchor_fields = ( + 'showversions' => $env{'form.showversions'}, + 'currentpath' => $env{'form.currentpath'}, + 'fieldname' => $env{'form.fieldname'}, + 'mode' => $env{'form.mode'} + ); + my $result = '

'.&make_anchor($url,\%anchor_fields,&mt($message)).'

'; return $result; } @@ -449,7 +538,7 @@ sub delete { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my ($uname,$udom) = &get_name_dom(); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print ("The file is locked and cannot be deleted.
"); + $r->print("The file is locked and cannot be deleted.
"); $r->print(&done('Back',$url)); } else { if (scalar(@files)) { @@ -464,18 +553,55 @@ sub delete { } sub delete_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; my ($uname,$udom) = &get_name_dom(); my $port_path = &get_port_path(); + my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, + $uname); foreach my $delete_file (@files) { $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path. $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(''. + &mt('An error occured ([_1]) while trying to delete + [_2].',$result,&display_file(undef, $delete_file)). + '

'); + } else { + $r->print(&mt('File: [_1] deleted.', + &display_file(undef,$delete_file))); + my $file_name = $env{'form.currentpath'}.$delete_file; + $file_name = &prepend_group($file_name); + my %access_controls = + &Apache::lonnet::get_access_controls($current_permissions, + $group,$file_name); + if (keys(%access_controls) > 0) { + my %changes; + foreach my $key (keys(%{$access_controls{$file_name}})) { + $changes{'delete'}{$key} = 1; + } + if (keys(%changes) > 0) { + my ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($file_name,\%changes, + $udom,$uname); + if ($outcome ne 'ok') { + $r->print('
'.&mt("An error occured ([_1]) while ". + "trying to delete access controls for the file.",$outcome). + '

'); + } else { + if ($deloutcome eq 'ok') { + $r->print('
'.&mt('Access controls also deleted for the file.').'

'); + } else { + $r->print(''.'
'. + &mt("An error occured ([_1]) while ". + "trying to delete access controls for the file.",$deloutcome). + '


'); + } + } + } + } } } $r->print(&done(undef,$url)); @@ -523,7 +649,7 @@ sub rename { my ($uname,$udom) = &get_name_dom(); $file_name = &prepend_group($file_name); if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') { - $r->print ("The file is locked and cannot be renamed.
"); + $r->print("The file is locked and cannot be renamed.
"); $r->print(&done(undef,$url)); } else { &open_form($r,$url); @@ -534,7 +660,7 @@ sub rename { } sub rename_confirmed { - my ($r,$url)=@_; + my ($r,$url,$group)=@_; my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'}); my ($uname,$udom) = &get_name_dom(); my $port_path = &get_port_path(); @@ -545,26 +671,81 @@ sub rename_confirmed { $r->print(&done(undef,$url)); return; } + my $chg_access; my $result= &Apache::lonnet::renameuserfile($uname,$udom, $port_path.$env{'form.currentpath'}.$env{'form.selectfile'}, $port_path.$env{'form.currentpath'}.$filenewname); - if ($result ne 'ok') { + if ($result eq 'ok') { + $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname); + } else { $r->print(''. - &mt('An errror occured ([_1]) while trying to rename [_2]' + &mt('An error occured ([_1]) while trying to rename [_2]' .' to [_3]',$result,&display_file(), &display_file('',$filenewname)).'
'); + return; } if ($filenewname ne $env{'form.filenewname'}) { $r->print(&mt("The new file name was changed from:
[_1] to [_2]", ''.&display_file('',$env{'form.filenewname'}).'', ''.&display_file('',$filenewname).'')); } + $r->print($chg_access); $r->print(&done(undef,$url)); } +sub access_for_renamed { + my ($filenewname,$group,$udom,$uname) = @_; + my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'}; + $oldfile = &prepend_group($oldfile); + my $newfile = $env{'form.currentpath'}.$filenewname; + $newfile = &prepend_group($newfile); + my $current_permissions = + &Apache::lonnet::get_portfile_permissions($udom,$uname); + my %access_controls = + &Apache::lonnet::get_access_controls($current_permissions, + $group,$oldfile); + my $chg_text; + if (keys(%access_controls) > 0) { + my %change_old; + my %change_new; + foreach my $key (keys(%{$access_controls{$oldfile}})) { + $change_old{'delete'}{$key} = 1; + $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key}; + } + my ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($oldfile,\%change_old, + $udom,$uname); + if ($outcome ne 'ok') { + $chg_text ='

'.&mt("An error occured ([_1]) while ". + "trying to delete access control records for the old name.",$outcome). + '
'; + } else { + if ($deloutcome ne 'ok') { + $chg_text = '


'. + &mt("An error occured ([_1]) while ". + "trying to delete access control records for the old name.",$deloutcome). + '

'; + } + } + ($outcome,$deloutcome,$new_values,$translation) = + &Apache::lonnet::modify_access_controls($newfile,\%change_new, + $udom,$uname); + if ($outcome ne 'ok') { + $chg_text .= '

'. + &mt("An error occured ([_1]) while ". + "trying to update access control records for the new name.",$outcome). + '
'; + } + if ($chg_text eq '') { + $chg_text = '

'.&mt('Access controls updated to reflect the name change.'); + } + } + return $chg_text; +} + sub display_access { - my ($r,$url,$group,$can_setacl,$port_path) = @_; + my ($r,$url,$group,$can_setacl,$port_path,$action) = @_; my ($uname,$udom) = &get_name_dom(); my $file_name = $env{'form.currentpath'}.$env{'form.access'}; $file_name = &prepend_group($file_name); @@ -572,17 +753,29 @@ sub display_access { $uname); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); - my $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$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.').'
'; - - if ($group eq '') { - $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme")); + my ($header,$info); + if ($action eq 'chgaccess') { + $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; + $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.'); + $info .= '
'; + if ($group eq '') { + $info .= (&mt("A listing of files viewable without log-in is available at: http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio.
For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:
http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme
")); + } + } else { + $header = '

'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'. + &explain_conditionals().'
'; } - if ($can_setacl) { &open_form($r,$url); $r->print($header.$info); - &access_setting_table($r,$access_controls{$file_name}); + $r->print('
'.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', 'Help on setting up share access')); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', 'Help on changing settings')); + $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', 'Help on removing share access')); + &access_setting_table($r,$url,$file_name,$access_controls{$file_name}, + $action); my $button_text = { 'continue' => &mt('Proceed'), 'cancel' => &mt('Back to directory listing'), @@ -597,6 +790,13 @@ sub display_access { } } +sub explain_conditionals { + return + &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
'."\n". + &mt('The conditions can include affiliation with a particular course, or a user account in a specific domain.').'
'."\n". + &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); +} + sub view_access_settings { my ($r,$url,$access_controls,$aclcount) = @_; my ($showstart,$showend); @@ -619,8 +819,10 @@ sub view_access_settings { } else { $r->print(&mt('No access control settings currently exist for this file.
' )); } - $r->print('
'.&mt('Return to directory listing').''); + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'} + ); + $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing'))); return; } @@ -633,9 +835,8 @@ sub build_access_summary { domains => 'Conditional: domain-based', users => 'Conditional: user-based', course => 'Conditional: course-based', - group => 'Conditional: group-based', ); - my @allscopes = ('public','guest','domains','users','course','group'); + my @allscopes = ('public','guest','domains','users','course'); foreach my $scope (@allscopes) { if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { next; @@ -658,7 +859,7 @@ sub build_access_summary { } } $r->print(''.&mt($scope_desc{$scope})); - if (($scope eq 'course') || ($scope eq 'group')) { + if ($scope eq 'course') { if ($chg ne 'delete') { my $cid = $content->{'domain'}.'_'.$content->{'number'}; my %course_description = &Apache::lonnet::coursedescription($cid); @@ -670,16 +871,12 @@ sub build_access_summary { if ($chg ne 'delete') { if ($scope eq 'guest') { $r->print(&mt('Passphrase').': '.$content->{'password'}); - } elsif ($scope eq 'course' || $scope eq 'group') { + } elsif ($scope eq 'course') { $r->print(''); $r->print(''); - if ($scope eq 'course') { - $r->print(''); - } else { - $r->print(''); - } + $r->print(''); $r->print(''); foreach my $id (sort(keys(%{$content->{'roles'}}))) { $r->print(''); @@ -703,11 +900,11 @@ sub build_access_summary { } else { $r->print(join(',',@{$content->{'roles'}{$id}{$item}})); } - $r->print(''); + $r->print(''); } - $r->print("
'.&mt('Roles').''. &mt('Access').''. &mt('Sections').''.&mt('Groups').''.&mt('Teams').''.&mt('Groups').'
"); + $r->print(''); } - $r->print(""); + $r->print(''); } elsif ($scope eq 'domains') { $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}})); } elsif ($scope eq 'users') { @@ -821,14 +1018,14 @@ sub update_access { my $totalnew = 0; my $status = 'new'; my ($firstitem,$lastitem); - foreach my $newitem ('course','group','domains','users') { + foreach my $newitem ('course','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); - foreach my $newitem ('course','group','domains','users') { + foreach my $newitem ('course','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; @@ -844,12 +1041,13 @@ sub update_access { } &close_form($r,$url); } else { - $r->print('
'. - &mt('Display all access settings for this file').''. - '     '. - ''.&mt('Return to directory listing').''); + my %anchor_fields = ( + 'currentpath' => $env{'form.currentpath'}, + 'access' => $env{'form.selectfile'} + ); + $r->print('
'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file'))); + delete $anchor_fields{'access'}; + $r->print('     '.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing'))); } return; } @@ -866,7 +1064,7 @@ sub build_access_record { if ($scope eq 'guest') { $record->{'password'} = $env{'form.password'}; - } elsif (($scope eq 'course') || ($scope eq 'group')) { + } elsif ($scope eq 'course') { $record->{'domain'} = $env{'form.crsdom_'.$num}; $record->{'number'} = $env{'form.crsnum_'.$num}; my @role_ids; @@ -948,19 +1146,18 @@ sub sort_users { } sub access_setting_table { - my ($r,$access_controls) = @_; + my ($r,$url,$filename,$access_controls,$action) = @_; my ($public,$publictext); - $publictext = &mt('Off'); + $publictext ='Off'; my ($guest,$guesttext); - $guesttext = &mt('Off'); + $guesttext = '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); + my (%acl_count,%end,%start,%conditionals); foreach my $key (sort(keys(%{$access_controls}))) { ($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key); if ($scope eq 'public') { @@ -971,19 +1168,34 @@ sub access_setting_table { $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); + } else { + $conditionals{$scope}{$key} = $$access_controls{$key}; + if ($scope eq 'course') { + push(@courses,$key); + } elsif ($scope eq 'domains') { + push(@domains,$key); + } elsif ($scope eq 'users') { + push(@users,$key); + } } $acl_count{$scope} ++; } $r->print('
'); - $r->print('

'.&mt('Public access:').' '.$publictext.'

'); + if ($action eq 'chgaccess') { + &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start, + \%end,$public,$publicnum,$publictext,$guest,$guestnum, + $guesttext,$access_controls,%conditionals); + } else { + &condition_setting($r,$access_controls,$now,$then,\%acl_count, + \@domains,\@users,\@courses); + } + $r->print('
'); +} + +sub standard_settings { + my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum, + $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_; + $r->print('

'.&mt('Public access: [_1]',$publictext).'

'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Action').''.&mt('Dates available').''); @@ -991,7 +1203,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::start_data_table_row()); if ($public) { $r->print(''.&actionbox('old',$publicnum,'public').''. - &dateboxes($publicnum,$start{$public},$end{$public}).''); + &dateboxes($publicnum,$start->{$public},$end->{$public}).''); } else { $r->print(''.&actionbox('new','0','public').''. &dateboxes('0',$now,$then).''); @@ -999,7 +1211,7 @@ sub access_setting_table { $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); $r->print(' '); - $r->print('

'.&mt('Passphrase-protected access:').' '.$guesttext.'

'); + $r->print('

'.&mt('Passphrase-protected access: [_1]',$guesttext).'

'); $r->print(&Apache::loncommon::start_data_table()); $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Action').''.&mt('Dates available'). @@ -1010,7 +1222,7 @@ sub access_setting_table { if ($guest) { $passwd = $$access_controls{$guest}{'password'}; $r->print(''.&actionbox('old',$guestnum,'guest').''. - &dateboxes($guestnum,$start{$guest},$end{$guest}).''); + &dateboxes($guestnum,$start->{$guest},$end->{$guest}).''); } else { $r->print(''.&actionbox('new','1','guest').''. &dateboxes('1',$now,$then).''); @@ -1019,36 +1231,75 @@ 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(' '. + ''); + my $numconditionals = 0; + my $conditionstext; + my %cond_status; + foreach my $scope ('domains','users','course') { + $numconditionals += $acl_count->{$scope}; + if ($acl_count->{$scope} > 0) { + if ($conditionstext ne 'Active') { + foreach my $key (keys(%{$conditionals{$scope}})) { + $conditionstext = &acl_status($start->{$key},$end->{$key},$now); + if ($conditionstext eq 'Active') { + last; + } + } + } + } + } + if ($conditionstext eq '') { + $conditionstext = 'Off'; + } + my %anchor_fields = ( + 'access' => $env{'form.selectfile'}, + 'action' => 'chgconditions', + 'currentpath' => $env{'form.currentpath'}, + ); + $r->print('

'.&mt('Conditional access: [_1]',$conditionstext).'

'); + if ($numconditionals > 0) { + my $count = 1; + my $chg = 'none'; + $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).'

'); + $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()); + &build_access_summary($r,$count,$chg,%conditionals); + $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.')); + } +} + +sub condition_setting { + my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_; + $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); + &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then); $r->print(''); - if (@courses > 0 || @groups > 0) { + if ($acl_count->{course} > 0) { $r->print(''); } else { $r->print(''); } - &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); + &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(''); } sub acl_status { my ($start,$end,$now) = @_; if ($start > $now) { - return &mt('Inactive'); + return 'Inactive'; } if ($end && $end<$now) { - return &mt('Inactive'); + return 'Inactive'; } - return &mt('Active'); + return 'Active'; } sub access_element { @@ -1083,7 +1334,7 @@ sub display_access_row { $r->print(&Apache::loncommon::start_data_table_header_row()); $r->print(''.&mt('Action?').''.&mt($uctype).''. &mt('Dates available').''); - if (($type eq 'course') || ($type eq 'group')) { + if ($type eq 'course') { $r->print(''.&mt('Allowed [_1] member affiliations',$type). ''); $colspan ++; @@ -1093,7 +1344,7 @@ sub display_access_row { $r->print(&Apache::loncommon::end_data_table_header_row()); foreach my $key (@{$items}) { $r->print(&Apache::loncommon::start_data_table_row()); - if (($type eq 'course') || ($type eq 'group')) { + if ($type eq 'course') { &course_row($r,$status,$type,$key,$access_controls,$now,$then); } elsif ($type eq 'domains') { &domains_row($r,$status,$key,\@all_doms,$access_controls,$now, @@ -1170,10 +1421,6 @@ sub course_row { } my $js = &Apache::loncommon::coursebrowser_javascript($defdom) .&course_js(); - my $crsgrptext = 'Groups'; - 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, @@ -1190,7 +1437,7 @@ sub course_row { $r->print(''); $r->print(''); + &mt('Groups').''); if ($status eq 'old') { my $max_id = 0; foreach my $role_id (sort(keys(%{$content->{'roles'}}))) { @@ -1260,7 +1507,12 @@ sub actionbox { my ($status,$num,$scope) = @_; my $output = '
'.&mt('Action').''.&mt('Roles').''. &mt('Access').''.&mt('Sections').''. - &mt($crsgrptext).'
'.$role_selects.'
'.&mt('Roles').''.&mt('[_1] status',$type).''.&mt('Sections').''.&mt($grouptitle).'

'); + $r->print(''.$role_selects.'
'.&mt('Roles').''.&mt('[_1] status',$type).''.&mt('Sections').''.&mt('Groups').'

'); return; } @@ -1476,6 +1724,7 @@ sub upload { } } $fname=&Apache::lonnet::clean_filename($fname); + my $portfolio_root=&get_portfolio_root(); my ($uname,$udom) = &get_name_dom(); my $port_path = &get_port_path(); @@ -1532,24 +1781,35 @@ sub lock_info { $file_name = &prepend_group($file_name); 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]"); - } + next if (ref($array_item) ne 'ARRAY'); + + my $filetext; + if (defined($group)) { + $filetext = ''.$env{'form.lockinfo'}. + ' (group: '.$group.')'; + } else { + $filetext = ''.$file_name.''; + } + + my $title =''.&Apache::lonnet::gettitle($$array_item[0]). + '
'; + if ($$array_item[-1] eq 'graded') { + $r->print(&mt('[_1] was submitted in response to problem: [_2]', + $filetext,$title)); + } elsif ($$array_item[-1] eq 'handback') { + $r->print(&mt('[_1] was handed back in response to problem: [_2]', + $filetext,$title)); + } else { + # submission style lock + $r->print(&mt('[_1] was submitted in response to problem: [_2]', + $filetext,$title)); + } + my %course_description = + &Apache::lonnet::coursedescription($$array_item[1]); + if ( $course_description{'description'} ne '') { + $r->print(&mt('In the course: [_1]
', + $course_description{'description'})); + } } } $r->print(&done('Back',$url)); @@ -1595,16 +1855,19 @@ sub createdir { } sub get_portfolio_root { - my ($udom,$uname) = @_; - if (!defined($uname) || !defined($udom)) { - ($uname,$udom) = &get_name_dom(); + my ($udom,$uname,$group) = @_; + if (!(defined($udom)) || !(defined($uname))) { + ($uname,$udom) = &get_name_dom(); } - my $path; - if (defined($env{'form.group'})) { - $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio'; - } else { - $path = '/userfiles/portfolio'; + my $path = '/userfiles/portfolio'; + if (!defined($group)) { + if (defined($env{'form.group'})) { + $group = $env{'form.group'}; + } } + if (defined($group)) { + $path = '/userfiles/groups/'.$group.'/portfolio'; + } return (&Apache::loncommon::propath($udom,$uname).$path); } @@ -1845,7 +2108,7 @@ sub handler { } } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { if ($can_delete) { - &delete_confirmed($r,$url); + &delete_confirmed($r,$url,$group); } else { &missing_priv($r,$url,'delete'); } @@ -1869,7 +2132,7 @@ sub handler { } } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { if ($can_modify) { - &rename_confirmed($r,$url); + &rename_confirmed($r,$url,$group); } else { &missing_priv($r,$url,'rename'); } @@ -1883,9 +2146,12 @@ sub handler { } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; - $env{'form.action'} = 'chgaccess'; - &display_access($r,$url,$group,$can_setacl,$port_path); - } elsif ($env{'form.action'} eq 'chgaccess') { + if (!defined($env{'form.action'})) { + $env{'form.action'} = 'chgaccess'; + } + &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'}); + } elsif (($env{'form.action'} eq 'chgaccess') || + ($env{'form.action'} eq 'chgconditions')) { if ($can_setacl) { &update_access($r,$url,$group,$port_path); } else {