--- loncom/interface/portfolio.pm 2006/06/20 03:02:33 1.106 +++ loncom/interface/portfolio.pm 2006/07/08 01:20:40 1.132 @@ -1,3 +1,8 @@ +# The LearningOnline Network +# portfolio browser +# +# $Id: portfolio.pm,v 1.132 2006/07/08 01:20:40 raeburn Exp $ +# # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -31,7 +36,8 @@ use Apache::lonfeedback; use Apache::lonlocal; use Apache::lonnet; use Apache::longroup; -use lib '/home/httpd/lib/perl'; +use Apache::lonhtmlcommon; +use HTML::Entities; use LONCAPA; # receives a file name and path stub from username/userfiles/portfolio/ @@ -40,65 +46,70 @@ 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; } my $dirptr=16384; sub display_common { - my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_; - my $groupitem; + my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_; my $namespace = &get_namespace($group); my $port_path = &get_port_path($group); - if (defined($group)) { - $groupitem = ''; - } - my $iconpath= $r->dir_config('lonIconsURL') . "/"; - my %text=&Apache::lonlocal::texthash('upload' => 'Upload', + if ($can_upload) { + my $groupitem; + if (defined($group)) { + $groupitem = ''; + } + my $iconpath= $r->dir_config('lonIconsURL') . "/"; + my %text=&Apache::lonlocal::texthash( + 'upload' => 'Upload', 'upload_label' => 'Upload file to current directory:', 'createdir' => 'Create Subdirectory', 'createdir_label' => 'Create subdirectory in current directory:'); - $r->print(<<"TABLE"); - - - - -
- $text{'upload_label'} - $groupitem + my $escuri = &HTML::Entities::encode($r->uri,'&<>"'); + $r->print(<<"TABLE"); + + + + - - - - - - + + + + - - + + +
+ $text{'upload_label'} + + + $groupitem -
- $text{'createdir_label'} - + +
+ $text{'createdir_label'} + +
$groupitem -
TABLE + } my @tree = split (/\//,$current_path); - $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/'); + $r->print(''.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/'); if (@tree > 1){ my $newCurrentPath = ''; for (my $i = 1; $i< @tree; $i++){ @@ -106,11 +117,11 @@ TABLE $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/'); } } - $r->print(''); + $r->print(''); &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path); - $r->print('
'. &Apache::lonhtmlcommon::select_recent($namespace,'currentpath', @@ -118,7 +129,8 @@ TABLE $r->print("
"); } sub display_directory { - my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_; + my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, + $can_modify,$can_delete,$can_setacl)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my ($groupitem,$groupecho); my $display_out; @@ -126,10 +138,15 @@ sub display_directory { my $checked_files; my $port_path = &get_port_path($group); my ($uname,$udom) = &get_name_dom($group); - if (defined($group)) { + my $access_admin_text = &mt('View Status'); + if ($can_setacl) { + $access_admin_text = &mt('View/Change Status'); + } + if ((defined($group)) && (defined($env{'request.course.id'}))) { $groupitem = ''; $groupecho = '&group='.$group; } + my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname); my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash( @@ -141,7 +158,7 @@ sub display_directory { $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'}); $select_mode = 'true'; } - if ($is_empty && ($current_path ne '/')) { + if ($is_empty && ($current_path ne '/') && $can_delete) { $display_out = '
'.$groupitem. ''. ''. @@ -153,13 +170,13 @@ sub display_directory { return; } if ($select_mode eq 'true') { - $r->print(''. - ''); $r->print(''); + $r->print('
Select NameSizeLast Modified
'. + ''); } else { - $r->print('
Select NameSizeLast Modified
'. - ''); $r->print(''); + $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
'. + ''); } if (defined($group)) { $r->print("\n".$groupitem."\n"); @@ -167,6 +184,7 @@ 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 @version_lines; my %versioned; foreach my $line (sort { @@ -180,94 +198,138 @@ sub display_directory { $filename =~ s/\s+$//; my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); if ($version) { - $versioned{$fname} .= $version.","; + push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); + $versioned{$fname.'.'.$extension} .= $version.","; + } else { + push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]); } - 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+)\.([^\.]*)$/)) { + my %version_flag; + my $show_versions; + if ($env{'form.showversions'} eq $filename) { + $show_versions = 'true'; + } + if (exists($versioned{$filename})) { + $version_flag{$filename} = ''.&mt('closed folder').''; + } else { + $version_flag{$filename} = ''; + } if ($dirptr&$testdir) { + my $colspan='colspan="2"'; if ($select_mode eq 'true'){ - $r->print(''); - } else { - $r->print(''); + undef($colspan); } + $r->print(''); $r->print(''); - $r->print(''); + $r->print(''); $r->print(''); } else { - $r->print(''); - my $version_flag; - if (exists($versioned{$fname})) { - $version_flag = "*"; - } else { - $version_flag = ""; - } - my $fullpath = $current_path.$filename; + my $css_class = 'LC_browser_file'; + my $line; + my $fullpath = $current_path.$filename; $fullpath = &prepend_group($fullpath,$group); - if ($select_mode eq 'true'){ - $r->print(''); + $line.=' />'; } else { if (exists $locked_files{$fullpath}) { - $r->print(''); + $line.=''; + $css_class= 'LC_browser_file_locked'; } else { - my $cat=''.&mt('Catalog Information'). - ''; - $r->print(' - '); - } - } - 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 (!$can_modify) { + $line .= ''; } } - if (!$pub_access) { - $curr_access = 'Private' - } else { - $curr_access = 'Public'; - } - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); - $r->print(''); + $r->print(''); + $r->print($line); + my $curr_access; + if ($select_mode ne 'true') { + 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('Passphrase-protected')); + } + if ($cond_access) { + push(@allaccesses,&mt('Conditional')); + } + $curr_access = join('+ ',@allaccesses); + } + } + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + if ($select_mode ne 'true') { + $r->print(''); + } + $r->print(''.$/); } } } if ($select_mode eq 'true') { $r->print('
Actions NameSizeLast ModifiedCurrent Access Status
'.&mt('closed folder').'Go to ...'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).''.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'
print("CHECKED"); + if ($select_mode eq 'true') { + $line='print('>LockedLocked - Rename'.$cat.' - '; + } else { + $line .= ''; } + if ($can_delete) { + $line .= ''; + } + if ($can_modify) { + my $cat=''.&mt('Catalog Information'). + ''; + $line .= 'Rename'; + $line .= ''.$version_flag{$filename}.''.$cat.''; + } + $line .= ''. - $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''.&mt($curr_access).'   '. - ''.&mt('View/Change').'
'.$version_flag{$filename}.''. + $filename.''.$size.''.&Apache::lonlocal::locallocaltime($mtime).''. + &mt($curr_access).'   '); + $r->print(''.$access_admin_text.'
- - - + + +
'); } else { - $r->print('
+ $r->print(''); + if ($can_delete) { + $r->print(' - '); + ' + ); + } } } @@ -287,14 +349,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,23 +370,27 @@ sub close_form { $r->print("\n".''); } - $r->print("\n".' + $r->print("\n".'

'); } sub display_file { my ($path,$filename)=@_; my $display_file_text; + my $file_start=''; + my $file_end=''; if (!defined($path)) { $path=$env{'form.currentpath'}; } if (!defined($filename)) { $filename=$env{'form.selectfile'}; - $display_file_text = ''.$path.$filename.''; + $display_file_text = $file_start.$path.$filename.$file_end; } elsif (ref($filename) eq "ARRAY") { - foreach (@$filename) { - $display_file_text .= ''.$path.$_.'
'; + foreach my $file (@$filename) { + $display_file_text .= $file_start.$path.$file.$file_end.'
'; } } elsif (ref($filename) eq "SCALAR") { - $display_file_text = ''.$path.$filename.''; + $display_file_text = $file_start.$path.$$filename.$file_end; + } else { + $display_file_text = $file_start.$path.$filename.$file_end; } return $display_file_text; } @@ -372,8 +444,8 @@ sub delete_confirmed { $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(' An error occured ('.$result. + ') while trying to delete '.&display_file(undef, $delete_file).'
'); } } $r->print(&done(undef,$url,$group)); @@ -397,8 +469,8 @@ sub delete_dir_confirmed { $directory_name); if ($result ne 'ok') { - $r->print(' An error occured (dir) ('.$result. - ') while trying to delete '.$directory_name.'
'); + $r->print(' An error occured (dir) ('.$result. + ') while trying to delete '.$directory_name.'
'); } else { # now remove from recent # $r->print('
removing '.$directory_name.'
print(''. + $r->print(''. &mt("Error: no valid filename was provided to rename to."). - '
'); + '
'); $r->print(&done(undef,$url,$group)); return; } @@ -448,41 +520,193 @@ sub rename_confirmed { $port_path.$env{'form.currentpath'}.$env{'form.selectfile'}, $port_path.$env{'form.currentpath'}.$filenewname); if ($result ne 'ok') { - $r->print(' An errror occured ('.$result. - ') while trying to rename '.&display_file().' to '. - &display_file(undef,$filenewname).'
'); + $r->print(''. + &mt('An errror occured ([_1]) while trying to rename [_2]' + .' to [_3]',$result,&display_file(), + &display_file('',$filenewname)).'
'); } if ($filenewname ne $env{'form.filenewname'}) { - $r->print("The new file name was changed from:
".$env{'form.filenewname'}." to $filenewname "); + $r->print(&mt("The new file name was changed from:
[_1] to [_2]", + ''.&display_file('',$env{'form.filenewname'}).'', + ''.&display_file('',$filenewname).'')); } $r->print(&done(undef,$url,$group)); } sub display_access { - my ($r,$url,$group) = @_; + my ($r,$url,$group,$can_setacl) = @_; 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); + my $aclcount = keys(%access_controls); + my $header = '

'.&mt('Allowing others to retrieve portfolio file: [_1]',$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 ($can_setacl) { + &open_form($r,$url); + $r->print($header.$info); + &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); + } else { + $r->print($header); + if ($aclcount) { + $r->print($info); + } + &view_access_settings($r,$url,$group,$access_controls{$file_name}, + $aclcount); + } } +sub view_access_settings { + my ($r,$url,$group,$access_controls,$aclcount) = @_; + my ($showstart,$showend); + my %todisplay; + foreach my $key (sort(keys(%{$access_controls}))) { + my ($num,$scope,$end,$start) = &unpack_acc_key($key); + $todisplay{$scope}{$key} = $$access_controls{$key}; + } + if ($aclcount) { + $r->print(&mt('

Current access controls defined for this file:

')); + $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()); + my $count = 1; + my $chg = 'none'; + &build_access_summary($r,$count,$chg,%todisplay); + $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&mt('No access control settings currently exist for this file.
' )); + } + my $group_arg; + if ($group) { + $group_arg = '&group='.$group; + } + $r->print('
'.&mt('Return to directory listing').''); + return; +} + +sub build_access_summary { + my ($r,$count,$chg,%todisplay) = @_; + my ($showstart,$showend); + my %scope_desc = ( + public => 'Public', + guest => 'Passphrase-protected', + domains => 'Conditional: domain-based', + users => 'Conditional: user-based', + course => 'Conditional: course-based', + group => 'Conditional: group-based', + ); + my @allscopes = ('public','guest','domains','users','course','group'); + foreach my $scope (@allscopes) { + if ((!(exists($todisplay{$scope}))) || (ref($todisplay{$scope}) ne 'HASH')) { + next; + } + foreach my $key (sort(keys(%{$todisplay{$scope}}))) { + if ($count) { + $r->print(&Apache::loncommon::start_data_table_row()); + } + my ($num,$scope,$end,$start) = &unpack_acc_key($key); + my $content = $todisplay{$scope}{$key}; + if ($chg eq 'delete') { + $showstart = &mt('Deleted'); + $showend = $showstart; + } else { + $showstart = localtime($start); + if ($end == 0) { + $showend = &mt('No end date'); + } else { + $showend = localtime($end); + } + } + $r->print(''.&mt($scope_desc{$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('Passphrase').': '.$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("
'.&mt('Roles').''. + &mt('Access').''. + &mt('Sections').''.&mt('Groups').''.&mt('Teams').'
'); + if ($item eq 'role') { + my $ucscope = $scope; + $ucscope =~ s/^(\w)/uc($1)/e; + 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(""); + } 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 ++; + } + } +} + + 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', + '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,89 +718,182 @@ 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(''.&mt('Type of change').''.&mt('Access control').''.&mt('Start date').''.&mt('End date').''); - $r->print(&Apache::loncommon::end_data_table_row()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''.&mt('Type of change').''. + &mt('Access control').''.&mt('Dates available'). + ''.&mt('Additional information').''); + $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); + $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(''.&mt($title{$chg}).'.'); + $r->print(''.&mt($title{$chg}). + '.'); my $count = 0; + my %todisplay; foreach my $key (sort(keys(%{$$changes{$chg}}))) { - if ($count) { - $r->print(&Apache::loncommon::start_data_table_row()); - } - my ($num,$scope,$end,$start) = - ($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}); - if ($chg eq 'delete') { - $showstart = &mt('Deleted'); - $showend = $showstart; - } else { - $showstart = localtime($start); - if ($end == 0) { - $showend = &mt('No end date'); - } else { - $showend = localtime($end); - } - } - $r->print(''.&mt($scope).''.$showstart. - ''. $showend.''); - $r->print(&Apache::loncommon::end_data_table_row()); - $count ++; + $todisplay{$scope}{$newkey} = $$updated_controls{$newkey}; } + &build_access_summary($r,$count,$chg,%todisplay); } } $r->print(&Apache::loncommon::end_data_table()); } else { if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) { - $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome); + $errors .= ''. + &mt('A problem occurred storing access control settings: [_1]',$outcome). + ''; } } if ($errors) { $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 { + my $group_arg; + if ($group) { + $group_arg = '&group='.$group; + } + $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 +909,482 @@ 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(''); + $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('Passphrase-protected access:').' '.$guesttext.'

'); $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print('		'.&mt('Action').''.&mt('Dates available'). + ''. &mt('Passphrase').''.&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 $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').''); + if (($type eq 'course') || ($type eq 'group')) { + $r->print(''.&mt('Allowed [_1] member affiliations',$type). + ''); + $colspan ++; + } elsif ($type eq 'domains') { + @all_doms = &Apache::loncommon::get_domains(); + } + $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')) { + &course_row($r,$status,$type,$key,$access_controls,$now,$then); + } elsif ($type eq 'domains') { + &domains_row($r,$status,$key,\@all_doms,$access_controls,$now, + $then); + } elsif ($type eq 'users') { + &users_row($r,$status,$key,$access_controls,$now,$then); + } + $r->print(&Apache::loncommon::end_data_table_row()); + } + if ($status eq 'old') { + $r->print(&Apache::loncommon::start_data_table_row()); + $r->print(''.&additional_item($type). + ''); + $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,$now,$then) = @_; + my $content; + my $defdom = $env{'user.domain'}; + if ($status eq 'old') { + $content = $$access_controls{$item}; + $defdom = $content->{'domain'}; + } + 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, + $type); + $r->print(''.$js.&actionbox($status,$num,$scope).''); + if ($status eq 'old') { + my $cid = $content->{'domain'}.'_'.$content->{'number'}; + my %course_description = &Apache::lonnet::coursedescription($cid); + $r->print(''.$course_description{'description'}.''); + } elsif ($status eq 'new') { + $r->print(''.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).'  '); + } + $r->print(''.&dateboxes($num,$start,$end).''); + $r->print(''); + $r->print(''); + 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').' {'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" />'); + } elsif ($status eq 'new') { + my $role_id = 1; + my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display'); + $r->print(''.&mt('Add').''.$role_selects); + $r->print(''); + } + 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 $uctype = $type; + $uctype =~ s/^(\w)/uc($1)/e; + my ($sections,$groups,$allroles,$rolehash,$accesshash) = + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype); + 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 $grouptitle = 'Groups'; + if ($type eq 'Group') { + $grouptitle = 'Teams'; + } + 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($grouptitle).'

'); + return; } sub select_files { @@ -682,7 +1406,7 @@ sub select_files { $java_files.=','; } my $javascript =(< + @@ -717,6 +1437,14 @@ sub upload { my $fname=$env{'form.uploaddoc.filename'}; my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?) my $disk_quota = 20000; # expressed in k + if (defined($group)) { + my $grp_quota = &get_group_quota($group); # quota expressed in k + if ($grp_quota ne '') { + $disk_quota = $grp_quota; + } else { + $disk_quota = 0; + } + } $fname=&Apache::lonnet::clean_filename($fname); my $portfolio_root=&get_portfolio_root($group); @@ -742,17 +1470,17 @@ sub upload { } my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root); if (($current_disk_usage + $filesize) > $disk_quota){ - $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes). Disk quota will be exceeded.'. + $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes). Disk quota will be exceeded.'. '
Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.'); $r->print(&done('Back',$url,$group)); } elsif ($found_file){ if ($locked_file){ - $r->print('Unable to upload '.$fname.', a locked file by that name was found in '.$port_path.$env{'form.currentpath'}.''. + $r->print(''.'Unable to upload '.$fname.', a locked file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
You will be able to rename or delete existing '.$fname.' after a grade has been assigned.'); $r->print(&done('Back',$url,$group)); } else { - $r->print('Unable to upload '.$fname.', a file by that name was found in '.$port_path.$env{'form.currentpath'}.''. + $r->print(''.'Unable to upload '.$fname.', a file by that name was found in '.$port_path.$env{'form.currentpath'}.''. '
To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'}); $r->print(&done('Back',$url,$group)); } @@ -760,14 +1488,15 @@ sub upload { my $result=&Apache::lonnet::userfileupload('uploaddoc','', $port_path.$env{'form.currentpath'}); if ($result !~ m|^/uploaded/|) { - $r->print(' An errror occured ('.$result. - ') while trying to upload '.&display_file().'
'); + $r->print(''.'An errror occured ('.$result. + ') while trying to upload '.&display_file().'
'); $r->print(&done('Back',$url,$group)); } else { $r->print(&done(undef,$url,$group)); } } } + sub lock_info { my ($r,$url,$group) = @_; my ($uname,$udom) = &get_name_dom($group); @@ -804,9 +1533,9 @@ sub createdir { my ($r,$url,$group)=@_; my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'}); if ($newdir eq '') { - $r->print(''. + $r->print(''. &mt("Error: no directory name was provided."). - '
'); + '
'); $r->print(&done(undef,$url,$group)); return; } @@ -820,16 +1549,16 @@ sub createdir { } } if ($found_file){ - $r->print(' Unable to create a directory named '.$newdir. - ' a file or directory by that name already exists.
'); + $r->print(''.'Unable to create a directory named '.$newdir. + ' a file or directory by that name already exists.
'); } else { my ($uname,$udom) = &get_name_dom($group); my $port_path = &get_port_path($group); my $result=&Apache::lonnet::mkdiruserfile($uname,$udom, $port_path.$env{'form.currentpath'}.$newdir); if ($result ne 'ok') { - $r->print(' An errror occured ('.$result. - ') while trying to create a new directory '.&display_file().'
'); + $r->print(''.'An errror occured ('.$result. + ') while trying to create a new directory '.&display_file().'
'); } } if ($newdir ne $env{'form.newdir'}) { @@ -850,6 +1579,23 @@ sub get_portfolio_root { return (&Apache::loncommon::propath($udom,$uname).$path); } +sub get_group_quota { + my ($group) = @_; + my $group_quota; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group); + if (%curr_groups) { + my %group_info = &Apache::longroup::get_group_settings( + $curr_groups{$group}); + $group_quota = $group_info{'quota'}; #expressed in Mb + if ($group_quota) { + $group_quota = 1000 * $group_quota; #expressed in k + } + } + return $group_quota; +} + sub get_dir_list { my ($portfolio_root,$group) = @_; my ($uname,$udom) = &get_name_dom($group); @@ -873,7 +1619,7 @@ sub get_name_dom { sub prepend_group { my ($filename,$group) = @_; if (defined($group)) { - $filename = $group.'/'.$filename; + $filename = $group.$filename; } return $filename; } @@ -899,17 +1645,68 @@ sub get_port_path { return $port_path; } +sub missing_priv { + my ($r,$url,$priv,$group) = @_; + my $longtext = { + upload => 'upload files', + delete => 'delete files', + rename => 'rename files', + setacl => 'set access controls for files', + }; + my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"'); + my $rtnlink = 'print(&mt('in this portfolio.')); + } + $rtnlink .= '">'.&mt('Return to directory listing page').''; + $r->print('
'.$rtnlink); + $r->print(&Apache::loncommon::end_page()); + return; +} + +sub coursegrp_portfolio_header { + my ($cdom,$cnum,$group,$grp_desc)=@_; + my $gpterm = &Apache::loncommon::group_term(); + my $ucgpterm = $gpterm; + $ucgpterm =~ s/^(\w)/uc($1)/e; + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/$cdom/$cnum/$group/smppg", + text=>"$ucgpterm: $grp_desc", + title=>"Go to group's home page"}, + {href=>"//?group=$group", + text=>"Group Portfolio", + title=>"Display group portfolio"},); + my $output = &Apache::lonhtmlcommon::breadcrumbs( + &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc)); + return $output; +} + + 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','access']); - my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title); + ['selectfile','currentpath','meta','lockinfo','currentfile','action', + 'fieldname','mode','rename','continue','group','access','setnum', + 'cnum','cdom','type','setroles','showversions']); + my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc); if ($r->uri =~ m|^(/adm/)([^/]+)|) { $url = $1.$2; $caller = $2; } + my ($can_modify,$can_delete,$can_upload,$can_setacl); if ($caller eq 'coursegrp_portfolio') { # Needs to be in a course if (! ($env{'request.course.fn'})) { @@ -928,11 +1725,14 @@ sub handler { my %curr_groups = &Apache::longroup::coursegroups($udom,$uname, $group); if (%curr_groups) { + my %grp_content = &Apache::longroup::get_group_settings( + $curr_groups{$group}); + $grp_desc = &unescape($grp_content{'description'}); if (($view_permission) || (&Apache::lonnet::allowed('rgf', $env{'request.course.id'}.'/'.$group))) { $portfolio_root = &get_portfolio_root($group); } else { - $r->print('You do not have the privileges required to access the shared files space for this group'); + $r->print('You do not have the privileges required to access the shared files space for this group.'); $earlyout = 1; } } else { @@ -945,10 +1745,33 @@ sub handler { $earlyout = 1; } if ($earlyout) { return OK; } + if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) { + $can_modify = 1; + $can_delete = 1; + $can_upload = 1; + $can_setacl = 1; + } else { + if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) { + $can_setacl = 1; + } + if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) { + $can_upload = 1; + } + if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) { + $can_modify = 1; + } + if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) { + $can_delete = 1; + } + } } else { ($uname,$udom) = &get_name_dom(); $portfolio_root = &get_portfolio_root(); $title = &mt('Portfolio Manager'); + $can_modify = 1; + $can_delete = 1; + $can_upload = 1; + $can_setacl = 1; } &Apache::loncommon::no_cache($r); @@ -958,14 +1781,19 @@ sub handler { if ($env{"form.mode"} eq 'selectfile'){ $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::start_page($title)); } $r->rflush(); if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){ - $r->print(' No file was selected to upload.'. - 'To upload a file, click Browse...'. - ', select a file, then click Upload,'); + $r->print(''. + 'No file was selected to upload.'. + 'To upload a file, click Browse...'. + ', select a file, then click Upload.'. + ''); } if ($env{'form.meta'}) { &open_form($r,$url); @@ -977,29 +1805,71 @@ sub handler { } if ($env{'form.uploaddoc.filename'}) { - &upload($r,$url,$group); + if ($can_upload) { + &upload($r,$url,$group); + } else { + &missing_priv($r,$url,'upload',$group), + } } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) { - &delete_confirmed($r,$url,$group); + if ($can_delete) { + &delete_confirmed($r,$url,$group); + } else { + &missing_priv($r,$url,'delete',$group); + } } elsif ($env{'form.action'} eq 'delete') { - &delete($r,$url,$group); + if ($can_delete) { + &delete($r,$url,$group); + } else { + &missing_priv($r,$url,'delete',$group); + } } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) { - &delete_dir_confirmed($r,$url,$group); - } elsif ($env{'form.action'} eq 'deletedir'){ - &delete_dir($r,$url,$group); + if ($can_delete) { + &delete_dir_confirmed($r,$url,$group); + } else { + &missing_priv($r,$url,'delete',$group); + } + } elsif ($env{'form.action'} eq 'deletedir') { + if ($can_delete) { + &delete_dir($r,$url,$group); + } else { + &missing_priv($r,$url,'delete',$group); + } } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) { - &rename_confirmed($r,$url,$group); + if ($can_modify) { + &rename_confirmed($r,$url,$group); + } else { + &missing_priv($r,$url,'rename',$group); + } } elsif ($env{'form.rename'}) { $env{'form.selectfile'} = $env{'form.rename'}; $env{'form.action'} = 'rename'; - &rename($r,$url,$group); + if ($can_modify) { + &rename($r,$url,$group); + } else { + &missing_priv($r,$url,'rename',$group); + } } elsif ($env{'form.access'}) { $env{'form.selectfile'} = $env{'form.access'}; $env{'form.action'} = 'chgaccess'; - &display_access($r,$url,$group); + &display_access($r,$url,$group,$can_setacl); } elsif ($env{'form.action'} eq 'chgaccess') { - &update_access($r,$url,$group); + if ($can_setacl) { + &update_access($r,$url,$group); + } else { + &missing_priv($r,$url,'setacl',$group); + } + } elsif ($env{'form.action'} eq 'rolepicker') { + if ($can_setacl) { + &role_options_window($r); + } else { + &missing_priv($r,$url,'setacl',$group); + } } elsif ($env{'form.createdir'}) { - &createdir($r,$url,$group); + if ($can_upload) { + &createdir($r,$url,$group); + } else { + &missing_priv($r,$url,'upload',$group); + } } elsif ($env{'form.lockinfo'}) { &lock_info($r,$url,$group); } else { @@ -1007,6 +1877,10 @@ sub handler { if ($env{'form.currentpath'}) { $current_path = $env{'form.currentpath'}; } + if ($caller eq 'coursegrp_portfolio') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc)); + } my @dir_list=&get_dir_list($portfolio_root,$group); if ($dir_list[0] eq 'no_such_dir'){ # two main reasons for this: @@ -1028,11 +1902,14 @@ sub handler { } # need to know if directory is empty so it can be removed if desired 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); + &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group, + $can_upload); + &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group, + $can_upload,$can_modify,$can_delete,$can_setacl); $r->print(&Apache::loncommon::end_page()); } return OK; } + 1; __END__