--- loncom/interface/portfolio.pm 2006/06/28 19:56:59 1.125
+++ loncom/interface/portfolio.pm 2006/07/19 11:43:47 1.136
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.125 2006/06/28 19:56:59 albertel Exp $
+# $Id: portfolio.pm,v 1.136 2006/07/19 11:43:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::lonfeedback;
use Apache::lonlocal;
use Apache::lonnet;
use Apache::longroup;
+use Apache::lonhtmlcommon;
use HTML::Entities;
use LONCAPA;
@@ -43,24 +44,31 @@ use LONCAPA;
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
my ($url, $filename, $current_path, $current_mode, $field_name,
- $continue_select,$group) = @_;
+ $continue_select,$group,$refarg) = @_;
if ($continue_select ne 'true') {$continue_select = 'false'};
my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;
if (defined($group)) {
$anchor .= '&group='.$group;
+ if ($refarg ne '') {
+ $anchor .= '&'.$refarg;
+ }
}
$anchor .= '">'.$filename.'</a>';
return $anchor;
}
my $dirptr=16384;
sub display_common {
- my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,$refarg)=@_;
my $namespace = &get_namespace($group);
my $port_path = &get_port_path($group);
if ($can_upload) {
my $groupitem;
if (defined($group)) {
$groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ if (exists($env{'form.ref'})) {
+ $groupitem .= '<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />';
+ }
}
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my %text=&Apache::lonlocal::texthash(
@@ -108,12 +116,12 @@ sub display_common {
TABLE
}
my @tree = split (/\//,$current_path);
- $r->print('<span class="LC_current_location">'.&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,$refarg).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
+ $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group,$refarg).'/');
}
}
$r->print('</span>');
@@ -121,15 +129,38 @@ TABLE
$r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
if (defined($group)) {
$r->print('&group='.$group);
+ if ($refarg ne '') {
+ $r->print('&'.$refarg);
+ }
}
$r->print('">'.
&Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
'this.form.submit();'));
$r->print("</form>");
}
+sub display_directory_line {
+ my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access,
+ $now, $version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text)=@_;
+ # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+ $r->print('<tr class="'.$css_class.'">');
+ $r->print($line);
+ $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>'.$/);
+}
sub display_directory {
my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
- $can_modify,$can_delete,$can_setacl)=@_;
+ $can_modify,$can_delete,$can_setacl,$refarg)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my ($groupitem,$groupecho);
my $display_out;
@@ -142,8 +173,14 @@ sub display_directory {
$access_admin_text = &mt('View/Change Status');
}
if ((defined($group)) && (defined($env{'request.course.id'}))) {
- $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
$groupecho = '&group='.$group;
+ if ($refarg ne '') {
+ $groupecho .= '&'.$refarg;
+ }
+ if (exists($env{'form.ref'})) {
+ $groupitem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
+ }
}
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
@@ -183,6 +220,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
{
@@ -196,14 +234,30 @@ 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})) {
+ if ($show_versions) {
+ $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+ } else {
+ $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'){
@@ -211,18 +265,12 @@ 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,$refarg).'/</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') {
$line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
@@ -247,13 +295,11 @@ 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;
if ($select_mode ne 'true') {
my $pub_access = 0;
@@ -287,27 +333,36 @@ sub display_directory {
$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>');
- 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>');
+ &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,
+ $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text);
+# $r->print('<tr class="'.$css_class.'">');
+# $r->print($line);
+# $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 ($show_versions) {
+ &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls,
+ $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text);
+
}
- $r->print('</td></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.'" />
@@ -352,6 +407,10 @@ sub close_form {
if (defined($group)) {
$r->print("\n".'<input type="hidden" name="group" value="'.
$group.'" />');
+ if (exists($env{'form.ref'})) {
+ $r->print("\n".'<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />');
+ }
}
$r->print('</p></form>');
$r->print('<form action="'.$url.'" method="post">
@@ -360,7 +419,11 @@ sub close_form {
$env{'form.currentpath'}.'" />');
if (defined($group)) {
$r->print("\n".'<input type="hidden" name="group" value="'.
- $group.'" />');
+ $group.'" />');
+ if (exists($env{'form.ref'})) {
+ $r->print("\n".'<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />');
+ }
}
$r->print("\n".' <input type="submit" value="'.$button_text->{'cancel'}.'" />
</p></form>');
@@ -388,7 +451,7 @@ sub display_file {
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url,$group,$refarg)=@_;
unless (defined $message) {
$message='Done';
}
@@ -397,14 +460,17 @@ sub done {
'&fieldname='.$env{'form.fieldname'}.
'&mode='.$env{'form.mode'};
if (defined($group)) {
- $result .= '&group='.$group;
+ $result .= '&group='.$group;
+ if ($refarg ne '') {
+ $result .= '&'.$refarg;
+ }
}
$result .= '">'.&mt($message).'</a></h3>';
return $result;
}
sub delete {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$file_name = &prepend_group($file_name,$group);
@@ -412,7 +478,7 @@ sub delete {
my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be deleted.<br />");
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
if (scalar(@files)) {
&open_form($r,$url);
@@ -420,13 +486,13 @@ sub delete {
&close_form($r,$url,$group);
} else {
$r->print("No file was checked to delete.<br />");
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
}
}
sub delete_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
my ($uname,$udom) = &get_name_dom($group);
@@ -440,7 +506,7 @@ sub delete_confirmed {
') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
}
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub delete_dir {
@@ -451,7 +517,7 @@ sub delete_dir {
}
sub delete_dir_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
my ($uname,$udom) = &get_name_dom($group);
@@ -476,17 +542,17 @@ sub delete_dir_confirmed {
}
$env{'form.currentpath'} = $directory_name;
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub rename {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name,$group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be renamed.<br />");
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
} else {
&open_form($r,$url);
$r->print('<p>'.&mt('Rename').' '.&display_file().' to
@@ -496,7 +562,7 @@ sub rename {
}
sub rename_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path($group);
@@ -504,7 +570,7 @@ sub rename_confirmed {
$r->print('<span class="LC_error">'.
&mt("Error: no valid filename was provided to rename to.").
'</span><br />');
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
return;
}
my $result=
@@ -522,11 +588,11 @@ sub rename_confirmed {
'<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
'<strong>'.&display_file('',$filenewname).'</strong>'));
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub display_access {
- my ($r,$url,$group,$can_setacl) = @_;
+ my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_;
my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name,$group);
@@ -534,7 +600,7 @@ sub display_access {
$uname);
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 $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$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);
@@ -551,12 +617,12 @@ sub display_access {
$r->print($info);
}
&view_access_settings($r,$url,$group,$access_controls{$file_name},
- $aclcount);
+ $aclcount,$refarg);
}
}
sub view_access_settings {
- my ($r,$url,$group,$access_controls,$aclcount) = @_;
+ my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_;
my ($showstart,$showend);
my %todisplay;
foreach my $key (sort(keys(%{$access_controls}))) {
@@ -580,6 +646,9 @@ sub view_access_settings {
my $group_arg;
if ($group) {
$group_arg = '&group='.$group;
+ if ($refarg ne '') {
+ $group_arg .= '&'.$refarg;
+ }
}
$r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
$group_arg.'">'.&mt('Return to directory listing').'</a>');
@@ -690,7 +759,7 @@ sub build_access_summary {
sub update_access {
- my ($r,$url,$group) = @_;
+ my ($r,$url,$group,$port_path,$refarg) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -716,7 +785,7 @@ sub update_access {
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
- $file_name).'</h3>'."\n");
+ $port_path.$file_name).'</h3>'."\n");
$file_name = &prepend_group($file_name,$group);
my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -809,10 +878,16 @@ sub update_access {
my $group_arg;
if ($group) {
$group_arg = '&group='.$group;
+ if ($refarg) {
+ $group_arg .= '&'.$refarg;
+ }
}
$r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
'&currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
- &mt('Display all access settings for this file').'</a>');
+ &mt('Display all access settings for this file').'</a>'.
+ ' '.
+ '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
+ $group_arg.'">'.&mt('Return to directory listing').'</a>');
}
return;
}
@@ -1408,11 +1483,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>
@@ -1429,10 +1500,18 @@ ENDSMP
}
}
sub upload {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
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);
@@ -1460,17 +1539,17 @@ sub upload {
if (($current_disk_usage + $filesize) > $disk_quota){
$r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
'<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
}
elsif ($found_file){
if ($locked_file){
$r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
'<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
$r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
'<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
}
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
@@ -1478,14 +1557,15 @@ sub upload {
if ($result !~ m|^/uploaded/|) {
$r->print('<span class="LC_error">'.'An errror occured ('.$result.
') while trying to upload '.&display_file().'</span><br />');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
}
}
+
sub lock_info {
- my ($r,$url,$group) = @_;
+ my ($r,$url,$group,$refarg) = @_;
my ($uname,$udom) = &get_name_dom($group);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
@@ -1513,11 +1593,11 @@ sub lock_info {
}
}
}
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
return 'ok';
}
sub createdir {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
if ($newdir eq '') {
$r->print('<span class="LC_error">'.
@@ -1551,7 +1631,7 @@ sub createdir {
if ($newdir ne $env{'form.newdir'}) {
$r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub get_portfolio_root {
@@ -1566,6 +1646,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);
@@ -1616,7 +1713,7 @@ sub get_port_path {
}
sub missing_priv {
- my ($r,$url,$priv,$group) = @_;
+ my ($r,$url,$priv,$group,$refarg) = @_;
my $longtext = {
upload => 'upload files',
delete => 'delete files',
@@ -1636,7 +1733,10 @@ sub missing_priv {
$longtext->{$priv}));
if ($group) {
$r->print(&mt("in the group's file repository."));
- $rtnlink .= '&group='.$group;
+ $rtnlink .= '&group='.$group;
+ if ($refarg ne '') {
+ $rtnlink .= '&'.$refarg;
+ }
} else {
$r->print(&mt('in this portfolio.'));
}
@@ -1646,19 +1746,43 @@ sub missing_priv {
return;
}
+sub coursegrp_portfolio_header {
+ my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_;
+ my $gpterm = &Apache::loncommon::group_term();
+ my $ucgpterm = $gpterm;
+ $ucgpterm =~ s/^(\w)/uc($1)/e;
+ if ($refarg) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursegroups",
+ text=>"Groups",
+ title=>"Course Groups"});
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
+ text=>"$ucgpterm: $grp_desc",
+ title=>"Go to group's home page"},
+ {href=>"/adm/coursegrp_portfolio?group=$group&$refarg",
+ 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','setnum',
- 'cnum','cdom','type','setroles']);
- my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
+ 'cnum','cdom','type','setroles','showversions','ref']);
+ 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);
+ my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg);
if ($caller eq 'coursegrp_portfolio') {
# Needs to be in a course
if (! ($env{'request.course.fn'})) {
@@ -1668,15 +1792,21 @@ sub handler {
return HTTP_NOT_ACCEPTABLE;
}
my $earlyout = 0;
- my $view_permission = &Apache::lonnet::allowed('vcg',
- $env{'request.course.id'});
+ my $view_permission =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
$group = $env{'form.group'};
$group =~ s/\W//g;
if ($group) {
+ if (exists($env{'form.ref'})) {
+ $refarg = 'ref='.$env{'form.ref'};
+ }
($uname,$udom) = &get_name_dom($group);
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);
@@ -1694,17 +1824,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();
@@ -1716,6 +1853,7 @@ sub handler {
$can_setacl = 1;
}
+ my $port_path = &get_port_path($group);
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1748,77 +1886,82 @@ sub handler {
if ($env{'form.uploaddoc.filename'}) {
if ($can_upload) {
- &upload($r,$url,$group);
+ &upload($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'upload',$group),
+ &missing_priv($r,$url,'upload',$group,$refarg),
}
} elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_confirmed($r,$url,$group);
+ &delete_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url,$group);
+ &delete($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url,$group);
+ &delete_dir_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'deletedir') {
if ($can_delete) {
&delete_dir($r,$url,$group);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
if ($can_modify) {
- &rename_confirmed($r,$url,$group);
+ &rename_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'rename',$group);
+ &missing_priv($r,$url,'rename',$group,$refarg);
}
} elsif ($env{'form.rename'}) {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url,$group);
+ &rename($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'rename',$group);
+ &missing_priv($r,$url,'rename',$group,$refarg);
}
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
$env{'form.action'} = 'chgaccess';
- &display_access($r,$url,$group,$can_setacl);
+ &display_access($r,$url,$group,$can_setacl,$port_path,$refarg);
} elsif ($env{'form.action'} eq 'chgaccess') {
if ($can_setacl) {
- &update_access($r,$url,$group);
+ &update_access($r,$url,$group,$port_path,$refarg);
} else {
- &missing_priv($r,$url,'setacl',$group);
+ &missing_priv($r,$url,'setacl',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'rolepicker') {
if ($can_setacl) {
&role_options_window($r);
} else {
- &missing_priv($r,$url,'setacl',$group);
+ &missing_priv($r,$url,'setacl',$group,$refarg);
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url,$group);
+ &createdir($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'upload',$group);
+ &missing_priv($r,$url,'upload',$group,$refarg);
}
} elsif ($env{'form.lockinfo'}) {
- &lock_info($r,$url,$group);
+ &lock_info($r,$url,$group,$refarg);
} else {
my $current_path='/';
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,
+ $refarg));
+ }
my @dir_list=&get_dir_list($portfolio_root,$group);
if ($dir_list[0] eq 'no_such_dir'){
# two main reasons for this:
@@ -1841,9 +1984,10 @@ 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,
- $can_upload);
+ $can_upload,$refarg);
&display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
- $can_upload,$can_modify,$can_delete,$can_setacl);
+ $can_upload,$can_modify,$can_delete,$can_setacl,
+ $refarg);
$r->print(&Apache::loncommon::end_page());
}
return OK;