--- loncom/interface/portfolio.pm 2006/06/22 18:33:58 1.115
+++ loncom/interface/portfolio.pm 2006/07/19 10:26:43 1.121.2.6
@@ -1,3 +1,8 @@
+# The LearningOnline Network
+# portfolio browser
+#
+# $Id: portfolio.pm,v 1.121.2.6 2006/07/19 10:26:43 albertel Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -31,6 +36,7 @@ use Apache::lonfeedback;
use Apache::lonlocal;
use Apache::lonnet;
use Apache::longroup;
+use Apache::lonhtmlcommon;
use HTML::Entities;
use LONCAPA;
@@ -49,29 +55,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 = '';
- }
- 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:');
- my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
- $r->print(<<"TABLE");
+ my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
+ $r->print(<<"TABLE");
$text{'upload_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++){
@@ -107,7 +117,7 @@ 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(' ");
}
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 +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(
@@ -142,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 = '
'.&mt('Roles').'
'.&mt('[_1] status',$type).'
'.&mt('Sections').'
'.&mt('Groups').'
'.$role_selects.'
');
+ $r->print('
'.&mt('Roles').'
'.&mt('[_1] status',$type).'
'.&mt('Sections').'
'.&mt($grouptitle).'
'.$role_selects.'
');
return;
}
@@ -1289,11 +1428,7 @@ ENDSMP
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
- opener.document.forms.lonhomework.
-ENDSMP
- $javascript .= $env{'form.fieldname'};
- $javascript .= (<
@@ -1314,6 +1449,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);
@@ -1339,17 +1482,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));
}
@@ -1357,14 +1500,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);
@@ -1401,9 +1545,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;
}
@@ -1417,16 +1561,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'}) {
@@ -1447,6 +1591,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);
@@ -1470,7 +1631,7 @@ sub get_name_dom {
sub prepend_group {
my ($filename,$group) = @_;
if (defined($group)) {
- $filename = $group.'/'.$filename;
+ $filename = $group.$filename;
}
return $filename;
}
@@ -1496,6 +1657,55 @@ 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;
@@ -1503,11 +1713,12 @@ sub handler {
['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);
+ 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'})) {
@@ -1526,11 +1737,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 {
@@ -1543,12 +1757,36 @@ 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;
}
+ my $port_path = &get_port_path($group);
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -1564,9 +1802,11 @@ sub handler {
}
$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);
@@ -1578,31 +1818,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,$port_path);
} elsif ($env{'form.action'} eq 'chgaccess') {
- &update_access($r,$url,$group);
+ if ($can_setacl) {
+ &update_access($r,$url,$group,$port_path);
+ } 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 {
@@ -1610,6 +1890,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:
@@ -1631,11 +1915,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__