--- loncom/interface/portfolio.pm 2006/06/22 19:01:30 1.116
+++ loncom/interface/portfolio.pm 2006/07/05 22:29:05 1.130
@@ -1,3 +1,8 @@
+# The LearningOnline Network
+# portfolio browser
+#
+# $Id: portfolio.pm,v 1.130 2006/07/05 22:29:05 banghart Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -49,29 +54,32 @@ sub make_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 = '<input type="hidden" name="group" value="'.$group.'" />';
- }
- my $iconpath= $r->dir_config('lonIconsURL') . "/";
- my %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+ if ($can_upload) {
+ my $groupitem;
+ if (defined($group)) {
+ $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ }
+ 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:');
- my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
- $r->print(<<"TABLE");
+ my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
+ $r->print(<<"TABLE");
<table id="LC_portfolio_actions">
<tr id="LC_portfolio_upload">
<td class="LC_label">
$text{'upload_label'}
</td>
- <td class="LC_value">$groupitem
+ <td class="LC_value">
<form method="post" enctype="multipart/form-data" action="$escuri">
+ $groupitem
<input name="uploaddoc" type="file" />
<input type="hidden" name="currentpath" value="$current_path" />
<input type="hidden" name="action" value="$env{"form.action"}" />
@@ -98,8 +106,9 @@ sub display_common {
</tr>
</table>
TABLE
+ }
my @tree = split (/\//,$current_path);
- $r->print('<font size="+2">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
+ $r->print('<span class="LC_current_location">'.&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++){
@@ -107,7 +116,7 @@ TABLE
$r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
}
}
- $r->print('</font>');
+ $r->print('</span>');
&Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
$r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
if (defined($group)) {
@@ -119,7 +128,8 @@ TABLE
$r->print("</form>");
}
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;
@@ -127,10 +137,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 = '<input type="hidden" name="group" value="'.$group.'" />';
$groupecho = '&group='.$group;
}
+
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash(
@@ -142,7 +157,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 = '<form method="post" action="'.$url.'">'.$groupitem.
'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
@@ -155,11 +170,11 @@ sub display_directory {
}
if ($select_mode eq 'true') {
$r->print('<form method="post" name="checkselect" action="'.$url.'">');
- $r->print('<table class="LC_browser">'.
+ $r->print('<table id="LC_browser">'.
'<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
} else {
$r->print('<form method="post" action="'.$url.'">');
- $r->print('<table class="LC_browser">'.
+ $r->print('<table id="LC_browser">'.
'<tr><th colspan="2">Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
}
if (defined($group)) {
@@ -181,7 +196,7 @@ sub display_directory {
$filename =~ s/\s+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if ($version) {
- $versioned{$fname} .= $version.",";
+ $versioned{$fname.'.'.$extension} .= $version.",";
}
push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
}
@@ -189,6 +204,12 @@ sub display_directory {
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;
+ if (exists($versioned{$filename})) {
+ $version_flag{$filename} = '<a href="portfolio?open_version='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+ } else {
+ $version_flag{$filename} = '';
+ }
if ($dirptr&$testdir) {
my $colspan='colspan="2"';
if ($select_mode eq 'true'){
@@ -196,20 +217,14 @@ sub display_directory {
}
$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
$r->print('<td>Go to ...</td>');
- $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');
+ $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
my $line;
- my $version_flag;
- if (exists($versioned{$fname})) {
- $version_flag = "*";
- } else {
- $version_flag = "";
- }
- my $fullpath = $current_path.$filename;
+ my $fullpath = $current_path.$filename;
$fullpath = &prepend_group($fullpath,$group);
- if ($select_mode eq 'true'){
+ if ($select_mode eq 'true') {
$line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
if ($$checked_files{$filename} eq 'selected') {
$line.=" checked ";
@@ -220,75 +235,93 @@ sub display_directory {
$line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';
$css_class= 'LC_browser_file_locked';
} else {
- my $cat='<img alt="'.&mt('Catalog Information').
- '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
- $line.='<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
- <a href="'.$url.'?rename='.$filename.'&currentpath='.$current_path.$groupecho.'">Rename</a></td>
- <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
- </td>';
- }
- $r->print('<tr class="'.$css_class.'">');
- $r->print($line);
- }
- my $curr_access;
- my $pub_access = 0;
- my $guest_access = 0;
- my $cond_access = 0;
- foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
- my ($num,$scope,$end,$start) = &unpack_acc_key($key);
- if (($now > $start) && (!$end || $end > $now)) {
- if ($scope eq 'public') {
- $pub_access = 1;
- } elsif ($scope eq 'guest') {
- $guest_access = 1;
+ if (!$can_modify) {
+ $line .= '<td colspan="2">';
} else {
- $cond_access = 1;
+ $line .= '<td>';
}
+ if ($can_delete) {
+ $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
+ }
+ if ($can_modify) {
+ my $cat='<img alt="'.&mt('Catalog Information').
+ '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
+ $line .= '<a href="'.$url.'?rename='.$filename.'&currentpath='.$current_path.$groupecho.'">Rename</a>';
+ $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+ }
+ $line .= '</td>';
}
}
- if (!$pub_access && !$guest_access && !$cond_access) {
- $curr_access = &mt('Private');
- } else {
- my @allaccesses;
- if ($pub_access) {
- push(@allaccesses,&mt('Public'));
- }
- if ($guest_access) {
- push(@allaccesses,&mt('Password-protected'));
- }
- if ($cond_access) {
- push(@allaccesses,&mt('Conditional'));
- }
- $curr_access = join('+ ',@allaccesses);
- }
- $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
- $r->print('<td><a href="'.$href_location.$filename.'">'.
- $filename.'</a></td>');
- $r->print('<td>'.$size.'</td>');
- $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
- $r->print('<td><span style="white-space: nowrap">'.&mt($curr_access).' '.
- '<a href="'.$url.'?access='.$filename.
- '&currentpath='.$current_path.$groupecho.
- '">'.&mt('View/Change').'</a></span></td>');
- $r->print('</tr>');
+ $r->print('<tr class="'.$css_class.'">');
+ $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('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+ $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
+ $filename.'</a></td>');
+ $r->print('<td>'.$size.'</td>');
+ $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+ if ($select_mode ne 'true') {
+ $r->print('<td><span style="white-space: nowrap">'.
+ &mt($curr_access).' ');
+ $r->print('<a href="'.$url.'?access='.$filename.
+ '&currentpath='.$current_path.$groupecho.
+ '">'.$access_admin_text.'</a></span></td>');
+ }
+ $r->print('</tr>'.$/);
}
}
}
if ($select_mode eq 'true') {
$r->print('</table>
- <input type="hidden" name="continue" value="true">
- <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">
- <input type="hidden" name="mode" value="selectfile">
+ <input type="hidden" name="continue" value="true" />
+ <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+ <input type="hidden" name="mode" value="selectfile" />
<input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
<input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
</form>');
} else {
- $r->print('</table>
+ $r->print('</table>');
+ if ($can_delete) {
+ $r->print('
<input type="submit" name="doit" value="Delete Checked Files" />
<input type="hidden" name="action" value="delete" />
<input type="hidden" name="currentpath" value="'.$current_path.'" />
- </form>');
+ </form>'
+ );
+ }
}
}
@@ -493,28 +526,171 @@ sub rename_confirmed {
}
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('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>'."\n");
- $r->print(&mt('Access to this file by others can be set to be one or more of the following types: public, password-protected or conditional.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Password-protected files do not require log-in, but will require the viewer to enter the password you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satify the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively you can grant access to people with specific LON-CAPA usernames and domains.').'</li></ul>');
- &access_setting_table($r,$access_controls{$file_name});
- my $button_text = {
+ my $aclcount = keys(%access_controls);
+ my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+ 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.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+ 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);
+ &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('<h4>Current access controls defined for this file:</h4>'));
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print('<th>'.&mt('Access control').'</th><th>'.&mt('Dates available').
+ '</th><th>'.&mt('Additional information').'</th>');
+ $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.<br />' ));
+ }
+ my $group_arg;
+ if ($group) {
+ $group_arg = '&group='.$group;
+ }
+ $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
+ $group_arg.'">'.&mt('Return to directory listing').'</a>');
+ 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('<td>'.&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('<br />('.$course_description{'description'}.')');
+ }
+ }
+ $r->print('</td><td>'.&mt('Start: ').$showstart.
+ '<br />'.&mt('End: ').$showend.'</td><td>');
+ if ($chg ne 'delete') {
+ if ($scope eq 'guest') {
+ $r->print(&mt('Passphrase').': '.$content->{'password'});
+ } elsif ($scope eq 'course' || $scope eq 'group') {
+ $r->print('<table><tr>');
+ $r->print('<th>'.&mt('Roles').'</th><th>'.
+ &mt('Access').'</th><th>'.
+ &mt('Sections').'</th>');
+ if ($scope eq 'course') {
+ $r->print('<th>'.&mt('Groups').'</th>');
+ } else {
+ $r->print('<th>'.&mt('Teams').'</th>');
+ }
+ $r->print('</tr>');
+ foreach my $id (sort(keys(%{$content->{'roles'}}))) {
+ $r->print('<tr>');
+ foreach my $item ('role','access','section','group') {
+ $r->print('<td>');
+ 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('</tr>');
+ }
+ $r->print("</table>");
+ }
+ $r->print("</tr></table>");
+ } elsif ($scope eq 'domains') {
+ $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
+ } elsif ($scope eq 'users') {
+ my $curr_user_list = &sort_users($content->{'users'});
+ $r->print(&mt('Users: ').$curr_user_list);
+ } else {
+ $r->print(' ');
+ }
+ } else {
+ $r->print(' ');
+ }
+ $r->print('</td>');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
}
+
sub update_access {
my ($r,$url,$group) = @_;
- my $function = &Apache::loncommon::get_users_function();
- my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -579,94 +755,16 @@ sub update_access {
$r->print('<td rowspan="'.$numchgs.'">'.&mt($title{$chg}).
'.</td>');
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) = &unpack_acc_key($key);
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
my $newkey = $key;
if ($chg eq 'activate') {
$newkey =~ s/^(\d+)/$$translation{$1}/;
}
- my $content = $$updated_controls{$newkey};
- if ($chg eq 'delete') {
- $showstart = &mt('Deleted');
- $showend = $showstart;
- } else {
- $showstart = localtime($start);
- if ($end == 0) {
- $showend = &mt('No end date');
- } else {
- $showend = localtime($end);
- }
- }
- $r->print('<td>'.&mt($scope));
- if (($scope eq 'course') || ($scope eq 'group')) {
- if ($chg ne 'delete') {
- my $cid = $content->{'domain'}.'_'.$content->{'number'};
- my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print('<br />('.$course_description{'description'}.')');
- }
- }
- $r->print('</td><td>'.&mt('Start: ').$showstart.
- '<br />'.&mt('End: ').$showend.'</td><td>');
- if ($chg ne 'delete') {
- if ($scope eq 'guest') {
- $r->print(&mt('Password').': '.$content->{'password'});
- } elsif ($scope eq 'course' || $scope eq 'group') {
- $r->print('<table border="0"><tr bgcol = "'.
- $tablecolor.'">');
- $r->print('<th>'.&mt('Roles').'</th><th>'.
- &mt('Access').'</th><th>'.
- &mt('Sections').'</th>');
- if ($scope eq 'course') {
- $r->print('<th>'.&mt('Groups').'</th>');
- } else {
- $r->print('<th>'.&mt('Teams').'</th>');
- }
- $r->print('</tr>');
- foreach my $id (sort(keys(%{$content->{'roles'}}))) {
- $r->print('<tr>');
- foreach my $item ('role','access','section','group') {
- $r->print('<td>');
- if ($item eq 'role') {
- my $ucscope = $scope;
- $ucscope =~ s/^(\w)/uc($1)/;
- my $role_output;
- foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
- if ($role eq 'all') {
- $role_output .= $role.',';
- } elsif ($role =~ /^cr/) {
- $role_output .= (split('/',$role))[3].',';
- } else {
- $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
- }
- }
- $role_output =~ s/,$//;
- $r->print($role_output);
- } else {
- $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
- }
- $r->print('</td>');
- }
- }
- $r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::end_data_table());
- } elsif ($scope eq 'domains') {
- $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
- } elsif ($scope eq 'users') {
- my $curr_user_list = &sort_users($content->{'users'});
- $r->print(&mt('Users: ').$curr_user_list);
- } else {
- $r->print(' ');
- }
- } else {
- $r->print(' ');
- }
- $r->print('</td>');
- $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());
@@ -708,8 +806,12 @@ sub update_access {
}
&close_form($r,$url,$group);
} else {
+ my $group_arg;
+ if ($group) {
+ $group_arg = '&group='.$group;
+ }
$r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
- '&currentpath='.$env{'form.currentpath'}.'">'.
+ '&currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
&mt('Display all access settings for this file').'</a>');
}
return;
@@ -860,11 +962,11 @@ sub access_setting_table {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print('</td><td width="40"> </td><td valign="top">');
- $r->print('<h3>'.&mt('Password-protected access:').' '.$guesttext.'</h3>');
+ $r->print('<h3>'.&mt('Passphrase-protected access:').' '.$guesttext.'</h3>');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Dates available').
- '</th><th>'. &mt('Password').'</th>');
+ '</th><th>'. &mt('Passphrase').'</th>');
$r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
my $passwd;
@@ -937,7 +1039,6 @@ sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
if (@{$items} > 0) {
my @all_doms;
- my $tablecolor;
my $colspan = 3;
my $uctype = $type;
$uctype =~ s/^(\w)/uc($1)/e;
@@ -949,25 +1050,22 @@ sub display_access_row {
$r->print('<th>'.&mt('Allowed [_1] member affiliations',$type).
'</th>');
$colspan ++;
- my $function = &Apache::loncommon::get_users_function();
- $tablecolor=&Apache::loncommon::designparm($function.'.tabbg');
} elsif ($type eq 'domains') {
@all_doms = &Apache::loncommon::get_domains();
}
$r->print(&Apache::loncommon::end_data_table_header_row());
- $r->print(&Apache::loncommon::start_data_table_row());
foreach my $key (@{$items}) {
+ $r->print(&Apache::loncommon::start_data_table_row());
if (($type eq 'course') || ($type eq 'group')) {
- &course_row($r,$status,$type,$key,$access_controls,
- $tablecolor,$now,$then);
+ &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());
}
- $r->print(&Apache::loncommon::end_data_table_row());
if ($status eq 'old') {
$r->print(&Apache::loncommon::start_data_table_row());
$r->print('<td colspan="',$colspan.'">'.&additional_item($type).
@@ -1026,7 +1124,7 @@ function getIndex(name,value) {
}
sub course_row {
- my ($r,$status,$type,$item,$access_controls,$tablecolor,$now,$then) = @_;
+ my ($r,$status,$type,$item,$access_controls,$now,$then) = @_;
my $content;
my $defdom = $env{'user.domain'};
if ($status eq 'old') {
@@ -1039,6 +1137,8 @@ sub course_row {
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('<td>'.$js.&actionbox($status,$num,$scope).'</td>');
@@ -1047,12 +1147,10 @@ sub course_row {
my %course_description = &Apache::lonnet::coursedescription($cid);
$r->print('<td><input type="hidden" name="crsdom_'.$num.'" value="'.$content->{'domain'}.'" /><input type="hidden" name="crsnum_'.$num.'" value="'.$content->{'number'}.'" />'.$course_description{'description'}.'</td>');
} elsif ($status eq 'new') {
- my $uctype = $type;
- $uctype =~ s/^(\w)/uc($1)/e;
$r->print('<td>'.&Apache::loncommon::selectcourse_link('portform','crsnum_'.$num,'crsdom_'.$num,'description_'.$num,undef,undef,$uctype).' <input type="text" name="description_'.$num.'" size="30" /><input type="hidden" name="crsdom_'.$num.'" /><input type="hidden" name="crsnum_'.$num.'" /></td>');
}
$r->print('<td>'.&dateboxes($num,$start,$end).'</td>');
- $r->print('<td><table border="0"><tr bgcolor="'.$tablecolor.'">');
+ $r->print('<td><table><tr>');
$r->print('<th>'.&mt('Action').'</th><th>'.&mt('Roles').'</th><th>'.
&mt('Access').'</th><th>'.&mt('Sections').'</th><th>'.
&mt($crsgrptext).'</th></tr>');
@@ -1066,7 +1164,7 @@ sub course_row {
my $role_selects = &role_selectors($num,$role_id,$status,$type,$content,'display');
$r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
}
- $r->print('</table><br />'.&mt('Add a roles-based condition').' <input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','Course'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
+ $r->print('</table><br />'.&mt('Add a roles-based condition').' <input type="checkbox" name ="add_role_'.$num.'" onClick="javascript:setRoleOptions(this,'."'$num','$content->{'domain'}','$content->{'number'}','$uctype'".')" value="'.$max_id.'" /><input type="hidden" name="role_'.$num.'_'.$max_id.'" /><input type="hidden" name="access_'.$num.'_'.$max_id.'" /><input type="hidden" name="section_'.$num.'_'.$max_id.'" /><input type="hidden" name="group_'.$num.'_'.$max_id.'" /></td>');
} elsif ($status eq 'new') {
my $role_id = 1;
my $role_selects = &role_selectors($num,$role_id,$status,$type,undef,'display');
@@ -1192,8 +1290,10 @@ sub role_selectors {
$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,$type);
+ &Apache::loncommon::get_secgrprole_info($cdom,$cnum,1,$uctype);
if (!@{$sections}) {
@{$sections} = ('none');
} else {
@@ -1251,6 +1351,10 @@ sub role_options_window {
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");
<script type="text/javascript">
@@ -1271,7 +1375,7 @@ function setRoles() {
</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('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt('Groups').'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
+ $r->print('<form name="rolepicker" action="/adm/portfolio" method="post"><table><tr><th>'.&mt('Roles').'</th><th>'.&mt('[_1] status',$type).'</th><th>'.&mt('Sections').'</th><th>'.&mt($grouptitle).'</th></tr><tr>'.$role_selects.'</tr></table><br /><input type="button" name="rolepickbutton" value="Save selections" onclick="setRoles()" />');
return;
}
@@ -1304,11 +1408,7 @@ ENDSMP
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
- opener.document.forms.lonhomework.
-ENDSMP
- $javascript .= $env{'form.fieldname'};
- $javascript .= (<<ENDSMP);
- .value=fileList;
+ opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
self.close();
}
</script>
@@ -1329,6 +1429,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);
@@ -1380,6 +1488,7 @@ sub upload {
}
}
}
+
sub lock_info {
my ($r,$url,$group) = @_;
my ($uname,$udom) = &get_name_dom($group);
@@ -1462,6 +1571,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);
@@ -1485,7 +1611,7 @@ sub get_name_dom {
sub prepend_group {
my ($filename,$group) = @_;
if (defined($group)) {
- $filename = $group.'/'.$filename;
+ $filename = $group.$filename;
}
return $filename;
}
@@ -1511,6 +1637,37 @@ 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 = '<a href="'.$url;
+ if ($url =~ /\?/) {
+ $rtnlink .= '&';
+ } else {
+ $rtnlink .= '?';
+ }
+ $rtnlink .= 'currentpath='.$escpath;
+ $r->print(&mt('<h3>Action disallowed</h3>'));
+ $r->print(&mt('You do not have sufficient privileges to [_1] ',
+ $longtext->{$priv}));
+ if ($group) {
+ $r->print(&mt("in the group's file repository."));
+ $rtnlink .= '&group='.$group;
+ } else {
+ $r->print(&mt('in this portfolio.'));
+ }
+ $rtnlink .= '">'.&mt('Return to directory listing page').'</a>';
+ $r->print('<br />'.$rtnlink);
+ $r->print(&Apache::loncommon::end_page());
+ return;
+}
+
sub handler {
# this handles file management
my $r = shift;
@@ -1523,6 +1680,7 @@ sub handler {
$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'})) {
@@ -1558,10 +1716,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);
@@ -1595,31 +1776,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') {
- &role_options_window($r);
+ 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 {
@@ -1648,11 +1869,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__