--- loncom/interface/portfolio.pm 2006/06/27 15:37:17 1.122
+++ loncom/interface/portfolio.pm 2006/07/05 22:52:53 1.131
@@ -1,3 +1,8 @@
+# The LearningOnline Network
+# portfolio browser
+#
+# $Id: portfolio.pm,v 1.131 2006/07/05 22:52:53 banghart Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -178,6 +183,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
{
@@ -191,14 +197,26 @@ 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} = '<a href="portfolio?showversions='.$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'){
@@ -206,20 +224,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 ";
@@ -242,63 +254,67 @@ sub display_directory {
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><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+ $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
$line .= '</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;
- } 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><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).' ');
- $r->print('<a href="'.$url.'?access='.$filename.
- '&currentpath='.$current_path.$groupecho.
- '">'.$access_admin_text.'</a>');
- $r->print('</span></td></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.'" />
@@ -526,20 +542,7 @@ sub display_access {
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
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>';
+ 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);
@@ -986,25 +989,24 @@ sub access_setting_table {
$passwd.'" /></td>');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
-
- #$r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">');
- #&access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
- #$r->print('</td><td> </td><td valign="top">');
- #&access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
- #$r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
- #if (@courses > 0 || @groups > 0) {
- # $r->print('<td colspan="3" valign="top">');
- #} else {
- # $r->print('<td valign="top">');
- #}
- #&access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
- #$r->print('</td>');
- #if (@courses > 0 || @groups > 0) {
- # $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">');
- #} else {
- # $r->print('<td> </td><td valign="top">');
- #}
- #&access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
+ $r->print('</td></tr><tr><td colspan="3"> </td></tr><tr><td valign="top">');
+ &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+ $r->print('</td><td> </td><td valign="top">');
+ &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+ $r->print('</td></tr><tr><td colspan="3"></td></tr><tr>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('<td colspan="3" valign="top">');
+ } else {
+ $r->print('<td valign="top">');
+ }
+ &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ $r->print('</td>');
+ if (@courses > 0 || @groups > 0) {
+ $r->print('</tr><tr><td colspan="3"> </td></tr><tr><td colspan="3" valign="top">');
+ } else {
+ $r->print('<td> </td><td valign="top">');
+ }
+ &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
$r->print('</td></tr></table>');
}
@@ -1413,11 +1415,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>
@@ -1438,6 +1436,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);
@@ -1489,6 +1495,7 @@ sub upload {
}
}
}
+
sub lock_info {
my ($r,$url,$group) = @_;
my ($uname,$udom) = &get_name_dom($group);
@@ -1571,6 +1578,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);
@@ -1657,7 +1681,7 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
- 'cnum','cdom','type','setroles']);
+ 'cnum','cdom','type','setroles','showversions']);
my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
@@ -1699,17 +1723,24 @@ sub handler {
$earlyout = 1;
}
if ($earlyout) { return OK; }
- 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)) {
+ if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
$can_modify = 1;
- }
- if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
$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();