');
+
+ my $fullpath = &prepend_group($current_path.$filename);
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print($line); # contains first two cells of table
+ my $lock_info;
+ if ($version_flag) { # versioned can't be versioned, so TRUE when root file
+ $r->print('
');
+ $r->print('
'.$version_flag.'
');
+ } else { # this is a graded or handed back file
+ my ($user,$domain) = &get_name_dom($env{'form.group'});
+ my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
+ if (defined($$permissions_hash{$fullpath})) {
+ foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
+ if (ref($array_item) eq 'ARRAY') {
+ if ($$array_item[-1] eq 'handback') {
+ $lock_info = 'Handback';
+ } elsif ($$array_item[-1] eq 'graded') {
+ $lock_info = 'Graded';
+ }
+ }
+ }
+ }
+ if ($lock_info) {
+ my %anchor_fields = ('lockinfo' => $fullpath);
+ if ($versions) { # hold the folder open
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+ $fname =~ s|^/||;
+ $anchor_fields{'showversions'} = $fname.'.'.$extension;
+ }
+ $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
+ }
+ $r->print('
'.&mt('Rename [_1] to [_2]?', &display_file()
+ , '').'
');
&close_form($r,$url);
}
}
sub rename_confirmed {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
+
+ # Display warning in case of filename cleaning has changed the filename
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print(
+ '
'
+ .&mt('Invalid characters')
+ .' '
+ .&mt('The new filename was changed from [_1] to [_2].'
+ ,''.&display_file('',$env{'form.filenewname'}).''
+ ,''.&display_file('',$filenewname).'')
+ .'
'
+ );
+
+ }
+
+ # Filename empty?
if ($filenewname eq '') {
- $r->print(''.
- &mt("Error: no valid filename was provided to rename to.").
- ' ');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no valid filename was provided to rename to.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
+ # Rename the file
+ my $chg_access;
my $result=
&Apache::lonnet::renameuserfile($uname,$udom,
$port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
$port_path.$env{'form.currentpath'}.$filenewname);
- if ($result ne 'ok') {
- $r->print(''.
- &mt('An errror occured ([_1]) while trying to rename [_2]'
- .' to [_3]',$result,&display_file(),
- &display_file('',$filenewname)).' ');
- }
- if ($filenewname ne $env{'form.filenewname'}) {
- $r->print(&mt("The new file name was changed from: [_1] to [_2]",
- ''.&display_file('',$env{'form.filenewname'}).'',
- ''.&display_file('',$filenewname).''));
+ if ($result eq 'ok') {
+ $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
+ ,$result,&display_file(),&display_file('',$filenewname))
+ ,1)));
+ $r->print(&done(undef,$url));
+ return;
}
+ $r->print($chg_access);
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('File successfully renamed'))));
$r->print(&done(undef,$url));
}
+sub access_for_renamed {
+ my ($filenewname,$group,$udom,$uname) = @_;
+ my $oldfile = $env{'form.currentpath'}.$env{'form.selectfile'};
+ $oldfile = &prepend_group($oldfile);
+ my $newfile = $env{'form.currentpath'}.$filenewname;
+ $newfile = &prepend_group($newfile);
+ my $current_permissions =
+ &Apache::lonnet::get_portfile_permissions($udom,$uname);
+ my %access_controls =
+ &Apache::lonnet::get_access_controls($current_permissions,
+ $group,$oldfile);
+ my $chg_text;
+ if (keys(%access_controls) > 0) {
+ my %change_old;
+ my %change_new;
+ foreach my $key (keys(%{$access_controls{$oldfile}})) {
+ $change_old{'delete'}{$key} = 1;
+ $change_new{'activate'}{$key} = $access_controls{$oldfile}{$key};
+ }
+ my ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($oldfile,\%change_old,
+ $udom,$uname);
+ if ($outcome ne 'ok') {
+ $chg_text ='
'.&mt("An error occurred ([_1]) while ".
+ "trying to delete access control records for the old name.",$outcome).
+ ' ';
+ } else {
+ if ($deloutcome ne 'ok') {
+ $chg_text = '
'.
+ &mt("An error occurred ([_1]) while ".
+ "trying to delete access control records for the old name.",$deloutcome).
+ ' ';
+ }
+ }
+ ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($newfile,\%change_new,
+ $udom,$uname);
+ if ($outcome ne 'ok') {
+ $chg_text .= '
'.
+ &mt("An error occurred ([_1]) while ".
+ "trying to update access control records for the new name.",$outcome).
+ ' ';
+ }
+ if ($chg_text eq '') {
+ $chg_text = '
'.&mt('Access controls updated to reflect the name change.');
+ }
+ }
+ return $chg_text;
+}
+
sub display_access {
- my ($r,$url,$group,$can_setacl,$port_path) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($r,$url,$group,$can_setacl,$port_path,$action) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
my $aclcount = keys(%access_controls);
- my $header = '
'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'
';
- my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.').'
'.&mt('Public files are available to anyone without the need for login.').'
'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'
'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').' '.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').' '.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'
';
+ my ($header,$info);
+ if ($action eq 'chgaccess') {
+ $header =
+ '
';
+ $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.');
+ $info .= '
'.&mt('Public files are available to anyone without the need for login.');
+ $info .= '
'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
+ $info .= '
'.&explain_conditionals();
+ $info .= '
'.
+ &mt('A listing of files viewable without log-in is available at: ')."".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio. ";
+ if ($group eq '') {
+ $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
+ } else {
+ $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
+ }
+ $info .= " ".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme ";
+ if ($group ne '') {
+ $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").' ';
+ }
+ } else {
+ $header = '
'.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'
'.
+ &explain_conditionals().' ';
+ }
if ($can_setacl) {
&open_form($r,$url);
$r->print($header.$info);
- &access_setting_table($r,$access_controls{$file_name});
+ $r->print(' '.&Apache::loncommon::help_open_topic('Portfolio ShareFile SetAccess', &mt('Help on setting up share access')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile ChangeSetting', &mt('Help on changing settings')));
+ $r->print(&Apache::loncommon::help_open_topic('Portfolio ShareFile StopAccess', &mt('Help on removing share access')));
+ &access_setting_table($r,$url,$file_name,$access_controls{$file_name},
+ $action);
my $button_text = {
'continue' => &mt('Proceed'),
- 'cancel' => &mt('Back to directory listing'),
+ 'cancel' => &mt('Return to directory'),
};
&close_form($r,$url,$button_text);
} else {
@@ -591,6 +940,13 @@ sub display_access {
}
}
+sub explain_conditionals {
+ return
+ &mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').' '."\n".
+ &mt('The conditions can include affiliation with a particular course or community, or a user account in a specific domain.').' '."\n".
+ &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.');
+}
+
sub view_access_settings {
my ($r,$url,$access_controls,$aclcount) = @_;
my ($showstart,$showend);
@@ -600,7 +956,7 @@ sub view_access_settings {
$todisplay{$scope}{$key} = $$access_controls{$key};
}
if ($aclcount) {
- $r->print(&mt('
Current access controls defined for this file:
'));
+ $r->print('
'.&mt('Current access controls defined for this file:').'
'.&mt('Allowing others to retrieve portfolio file: [_1]',
- $port_path.$file_name).'
'."\n");
+ $r->print('
'.&mt('Allowing others to retrieve file: [_1]',
+ ''.$port_path.$file_name.'').'
'."\n");
$file_name = &prepend_group($file_name);
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my ($errors,$outcome,$deloutcome,$new_values,$translation);
if ($totalprocessed) {
($outcome,$deloutcome,$new_values,$translation) =
@@ -803,7 +1159,7 @@ sub update_access {
} else {
if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
$errors .= ''.
- &mt('A problem occurred storing access control settings: [_1]',$outcome).
+ &mt('A problem occurred saving access control settings: [_1]',$outcome).
'';
}
}
@@ -815,22 +1171,28 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- foreach my $newitem ('course','group','domains','users') {
+ my @types = ('course','domains','users');
+ foreach my $newitem (@types) {
$allnew += $env{'form.new'.$newitem};
}
if ($allnew > 0) {
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
&open_form($r,$url);
- foreach my $newitem ('course','group','domains','users') {
+ my %showtypes = &Apache::lonlocal::texthash (
+ course => 'course/community',
+ domains => 'domain',
+ users => 'user',
+ );
+ foreach my $newitem (@types) {
if ($env{'form.new'.$newitem} > 0) {
- $r->print(' '.&mt('Add new [_1]-based access control for portfolio file: [_2]',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).'
');
+ $r->print(' '.&mt('Add new [_1]-based[_2] access control for portfolio file: [_3]',''.$showtypes{$newitem},'',''.$env{'form.currentpath'}.$env{'form.selectfile'}.'').'
');
$firstitem = $totalnew;
$lastitem = $totalnew + $env{'form.new'.$newitem};
$totalnew = $lastitem;
my @numbers;
for (my $i=$firstitem; $i<$lastitem; $i++) {
- push (@numbers,$i);
+ push(@numbers,$i);
}
&display_access_row($r,$status,$newitem,\@numbers,
$access_controls{$file_name},$now,$then);
@@ -838,12 +1200,15 @@ sub update_access {
}
&close_form($r,$url);
} else {
- $r->print(' '.
- &mt('Display all access settings for this file').''.
- ' '.
- ''.&mt('Return to directory listing').'');
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'},
+ 'access' => $env{'form.selectfile'}
+ );
+ my @actions;
+ push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+ delete $anchor_fields{'access'};
+ push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory')));
+ $r->print(' '.&Apache::lonhtmlcommon::actionbox(\@actions));
}
return;
}
@@ -860,7 +1225,7 @@ sub build_access_record {
if ($scope eq 'guest') {
$record->{'password'} = $env{'form.password'};
- } elsif (($scope eq 'course') || ($scope eq 'group')) {
+ } elsif ($scope eq 'course') {
$record->{'domain'} = $env{'form.crsdom_'.$num};
$record->{'number'} = $env{'form.crsnum_'.$num};
my @role_ids;
@@ -942,19 +1307,18 @@ sub sort_users {
}
sub access_setting_table {
- my ($r,$access_controls) = @_;
+ my ($r,$url,$filename,$access_controls,$action) = @_;
my ($public,$publictext);
- $publictext = &mt('Off');
+ $publictext ='Off';
my ($guest,$guesttext);
- $guesttext = &mt('Off');
+ $guesttext = 'Off';
my @courses = ();
- my @groups = ();
my @domains = ();
my @users = ();
my $now = time;
my $then = $now + (60*60*24*180); # six months approx.
my ($num,$scope,$publicnum,$guestnum);
- my (%acl_count,%end,%start);
+ my (%acl_count,%end,%start,%conditionals);
foreach my $key (sort(keys(%{$access_controls}))) {
($num,$scope,$end{$key},$start{$key}) = &unpack_acc_key($key);
if ($scope eq 'public') {
@@ -965,19 +1329,34 @@ sub access_setting_table {
$guest=$key;
$guestnum = $num;
$guesttext = &acl_status($start{$key},$end{$key},$now);
- } elsif ($scope eq 'course') {
- push(@courses,$key);
- } elsif ($scope eq 'group') {
- push(@groups,$key);
- } elsif ($scope eq 'domains') {
- push(@domains,$key);
- } elsif ($scope eq 'users') {
- push(@users,$key);
+ } else {
+ $conditionals{$scope}{$key} = $$access_controls{$key};
+ if ($scope eq 'course') {
+ push(@courses,$key);
+ } elsif ($scope eq 'domains') {
+ push(@domains,$key);
+ } elsif ($scope eq 'users') {
+ push(@users,$key);
+ }
}
$acl_count{$scope} ++;
}
$r->print('
'.&mt('Completed upload of the file.').' '.
+ &mt('This file contained references to other files.').' '.
+ &mt('You must upload the referenced files or else the uploaded file may not work properly.').
+ '
'.
+ '
'.&mt("Please select the locations from which the referenced files are to be uploaded.").'
'.
+ $embedded.
+ '
'.&mt('or').'
'.&done('Return to directory',$url));
+ } else {
+ $r->print('
'.&mt("Completed upload of the file. This file contained references to other files.").'
'.
+ $embedded.
+ '
'.&done('Return to directory',$url).'
');
+ }
+ } else {
+ $r->print(&done(undef,$url));
+ }
+ return;
+}
+
+sub overwrite {
+ my ($r,$url,$group)=@_;
+ my $formname = 'existingfile';
my $port_path = &get_port_path();
- # Fixme --- Move the checking for existing file to LOND error return
- my @dir_list=&get_dir_list($portfolio_root);
- my $found_file = 0;
- my $locked_file = 0;
- foreach my $line (@dir_list) {
- my ($file_name)=split(/\&/,$line,2);
- if ($file_name eq $fname){
- $file_name = $env{'form.currentpath'}.$file_name;
- $file_name = &prepend_group($file_name);
- $found_file = 1;
- if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $locked_file = 1;
- }
+ my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+ my (%allfiles,%codebase,$mode,$mimetype);
+ unless (&suppress_embed_prompt()) {
+ if ($env{'form.parserflag'}) {
+ if ($fname =~ /\.s?html?$/i) {
+ $mode = 'parse';
+ }
}
}
- 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.'.
- ' Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
- $r->print(&done('Back',$url));
- }
- 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'}.''.
- ' You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
- $r->print(&done('Back',$url));
- } else {
- $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));
- }
- } else {
- 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(&done('Back',$url));
+ if ($fname eq '') {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+ 'so after eliminating special characters there was nothing left.',
+ ''.$env{'form.filename'}.''),1)));
+ $r->print(&done(undef,$url));
+ return;
+ }
+ $env{'form.'.$formname.'.filename'} = $fname;
+ my $subdir = $port_path.$env{'form.currentpath'};
+ $subdir =~ s{(/)$}{};
+ my $result=
+ &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode,
+ \%allfiles,\%codebase,undef,undef,undef,
+ undef,undef,undef,\$mimetype);
+ if ($result !~ m|^/uploaded/|) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to overwrite [_2].'
+ ,$result,&display_file(undef,$fname)),1)));
+ } else {
+ if ($mode eq 'parse') {
+ if ($mimetype eq 'text/html') {
+ if (keys(%allfiles) > 0) {
+ &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+ return;
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))
+ .' '.&mt('No embedded items identified.')));
+ }
+ }
} else {
- $r->print(&done(undef,$url));
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Overwriting completed.'))));
}
}
+
+ my $group_elem;
+ if (defined($env{'form.group'})) {
+ $group_elem = '';
+ if (defined($env{'form.ref'})) {
+ $group_elem .= ''."\n";
+ }
+ }
+ my $hidden = &hidden_elems();
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''
+ .&mt('Return to directory')
+ .''])
+ .''
+ );
+ return;
}
sub lock_info {
my ($r,$url,$group) = @_;
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my $file_name = $env{'form.lockinfo'};
$file_name = &prepend_group($file_name);
if (defined($file_name) && defined($$current_permissions{$file_name})) {
foreach my $array_item (@{$$current_permissions{$file_name}}) {
- if (ref($array_item) eq 'ARRAY') {
- my $filetext;
- if (defined($group)) {
- $filetext = ''.$env{'form.lockinfo'}.
- ' (group: '.$group.')';
- } else {
- $filetext = ''.$file_name.'';
- }
- $r->print(&mt('[_1] was submitted in response to problem: ',
- $filetext).
- ''.&Apache::lonnet::gettitle($$array_item[0]).
- ' ');
- my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
- $r->print(&mt('In the course: [_1] ',
- $course_description{'description'}));
- # $r->print('the third is '.$$array_item[2].' ');
- # $r->print("item is $$array_item[0] and $$array_item[0]");
- }
+ next if (ref($array_item) ne 'ARRAY');
+
+ my $filetext;
+ if (defined($group)) {
+ $filetext = ''.$env{'form.lockinfo'}.
+ ' (group: '.$group.')';
+ } else {
+ $filetext = ''.$file_name.'';
+ }
+
+ my $title =''.&Apache::lonnet::gettitle($$array_item[0]).
+ ' ';
+ if ($$array_item[-1] eq 'graded') {
+ $r->print(&mt('[_1] was submitted in response to problem: [_2]',
+ $filetext,$title));
+ } elsif ($$array_item[-1] eq 'handback') {
+ $r->print(&mt('[_1] was handed back in response to problem: [_2]',
+ $filetext,$title));
+ } else {
+ # submission style lock
+ $r->print(&mt('[_1] was submitted in response to problem: [_2]',
+ $filetext,$title));
+ }
+ my %course_description =
+ &Apache::lonnet::coursedescription($$array_item[1]);
+ if ( $course_description{'description'} ne '') {
+ $r->print(&mt('In the course:').' '.$course_description{'description'}.' ');
+ }
}
}
- $r->print(&done('Back',$url));
+ $r->print(&done(undef,$url));
return 'ok';
}
sub createdir {
- my ($r,$url)=@_;
+ my ($r,$url,$group)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
+ # Display warning in case of directory name cleaning has changed the directory name
+ if ($newdir ne $env{'form.newdir'}) {
+ $r->print(
+ '
'
+ .&mt('Invalid characters')
+ .' '
+ .&mt('The new directory name was changed from [_1] to [_2].'
+ ,''.$env{'form.newdir'}.''
+ ,''.$newdir.'')
+ .'
'
+ );
+ }
+
+ # Directory name empty?
if ($newdir eq '') {
- $r->print(''.
- &mt("Error: no directory name was provided.").
- ' ');
- $r->print(&done(undef,$url));
- return;
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Error: no directory name was provided.'),1)));
+ $r->print(&done(undef,$url));
+ return;
}
+
my $portfolio_root = &get_portfolio_root();
- my @dir_list=&get_dir_list($portfolio_root);
+ my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
my $found_file = 0;
- foreach my $line (@dir_list) {
- my ($filename)=split(/\&/,$line,2);
- if ($filename eq $newdir){
- $found_file = 1;
+ if (ref($dirlistref) eq 'ARRAY') {
+ foreach my $line (@{$dirlistref}) {
+ my ($filename)=split(/\&/,$line,2);
+ if ($filename eq $newdir){
+ $found_file = 1;
+ }
}
}
- if ($found_file){
- $r->print(''.'Unable to create a directory named '.$newdir.
- ' a file or directory by that name already exists. ');
+ if ($found_file) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Unable to create a directory named [_1].'
+ ,''.$newdir.''),1)
+ .' '.&mt('A file or directory by that name already exists.')));
} else {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path();
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(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
+ ,$result,&display_file()),1)));
+
+ } else {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ &mt('Directory successfully created'))));
}
}
- if ($newdir ne $env{'form.newdir'}) {
- $r->print("The new directory name was changed from: ".$env{'form.newdir'}." to $newdir ");
- }
$r->print(&done(undef,$url));
}
sub get_portfolio_root {
- my ($uname,$udom) = &get_name_dom();
- my $path;
- if (defined($env{'form.group'})) {
- $path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
- } else {
- $path = '/userfiles/portfolio';
+ my ($udom,$uname,$group) = @_;
+ if (!(defined($udom)) || !(defined($uname))) {
+ ($uname,$udom) = &get_name_dom($group);
+ }
+ my $path = '/userfiles/portfolio';
+ if (!defined($group)) {
+ if (defined($env{'form.group'})) {
+ $group = $env{'form.group'};
+ }
}
- return (&Apache::loncommon::propath($udom,$uname).$path);
+ if (defined($group)) {
+ $path = '/userfiles/groups/'.$group.'/portfolio';
+ }
+ return $path;
}
sub get_group_quota {
@@ -1612,21 +2392,23 @@ sub get_group_quota {
$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) = @_;
- my ($uname,$udom) = &get_name_dom();
- return &Apache::lonnet::dirlist($env{'form.currentpath'},
- $udom,$uname,$portfolio_root);
+ my ($portfolio_root,$path,$group) = @_;
+ $path ||= $env{'form.currentpath'};
+ my ($uname,$udom) = &get_name_dom($group);
+ my $getpropath = 1;
+ return &Apache::lonnet::dirlist($portfolio_root.$path,$udom,$uname,$getpropath);
}
sub get_name_dom {
+ my ($group) = @_;
my ($uname,$udom);
- if (defined($env{'form.group'})) {
+ if (defined($group)) {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
} else {
@@ -1647,7 +2429,7 @@ sub prepend_group {
sub get_namespace {
my $namespace = 'portfolio';
if (defined($env{'form.group'})) {
- my ($uname,$udom) = &get_name_dom();
+ my ($uname,$udom) = &get_name_dom($env{'form.group'});
$namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
}
return $namespace;
@@ -1665,12 +2447,13 @@ sub get_port_path {
sub missing_priv {
my ($r,$url,$priv) = @_;
- my $longtext = {
+ my %longtext =
+ &Apache::lonlocal::texthash(
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 the group's group portfolio."));
$rtnlink .= &group_args()
} else {
- $r->print(&mt('in this portfolio.'));
+ $r->print(' '.&mt('in this portfolio.'));
}
- $rtnlink .= '">'.&mt('Return to directory listing page').'';
+ $rtnlink .= '">'.&mt('Return to directory').'';
$r->print(' '.$rtnlink);
- $r->print(&Apache::loncommon::end_page());
return;
}
@@ -1717,6 +2499,48 @@ sub coursegrp_portfolio_header {
return $output;
}
+sub get_quota {
+ my ($group) = @_;
+ my $disk_quota;
+ 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;
+ }
+ } else {
+ $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
+ $env{'user.domain'}); #expressed in Mb
+ $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+ }
+ return $disk_quota;
+}
+
+sub suppress_embed_prompt {
+ my $suppress_prompt = 0;
+ if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
+ if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
+ $suppress_prompt = 1;
+ }
+ }
+ return $suppress_prompt;
+}
+
+sub embedded_form_elems {
+ my ($container) = @_;
+ my $state = <
+
+
+
+
+STATE
+ if ($env{'form.group'} ne '') {
+ $state .= ''."\n";
+ }
+ return $state;
+}
sub handler {
# this handles file management
@@ -1724,7 +2548,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','showversions','ref']);
+ 'cnum','cdom','type','setroles','showversions','ref','symb']);
my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
@@ -1744,8 +2568,8 @@ sub handler {
&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
$env{'form.group'} =~ s/\W//g;
$group = $env{'form.group'};
- if ($group) {
- ($uname,$udom) = &get_name_dom();
+ if ($group ne '') {
+ ($uname,$udom) = &get_name_dom($group);
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
if (%curr_groups) {
@@ -1756,16 +2580,16 @@ sub handler {
$env{'request.course.id'}.'/'.$group))) {
$portfolio_root = &get_portfolio_root();
} else {
- $r->print('You do not have the privileges required to access the shared files space for this group.');
+ $r->print(&mt('You do not have the privileges required to access the shared files space for this group.'));
$earlyout = 1;
}
} else {
- $r->print('Not a valid group for this course');
+ $r->print(&mt('Not a valid group for this course'));
$earlyout = 1;
}
- $title = &mt('Group files').' for '.$group;
+ $title = &mt('Group portfolio for [_1]', $group);
} else {
- $r->print('Invalid group');
+ $r->print(&mt('Invalid group'));
$earlyout = 1;
}
if ($earlyout) { return OK; }
@@ -1791,7 +2615,7 @@ sub handler {
} else {
($uname,$udom) = &get_name_dom();
$portfolio_root = &get_portfolio_root();
- $title = &mt('Portfolio Manager');
+ $title = &mt('My Space');
$can_modify = 1;
$can_delete = 1;
$can_upload = 1;
@@ -1803,53 +2627,135 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
# Give the LON-CAPA page header
+ my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}];
+
if ($env{"form.mode"} eq 'selectfile'){
$r->print(&Apache::loncommon::start_page($title,undef,
{'only_body' => 1}));
} elsif ($env{'form.action'} eq 'rolepicker') {
$r->print(&Apache::loncommon::start_page('New role-based condition',undef,
{'no_nav_bar' => 1, }));
- } else {
+ } elsif ($caller eq 'coursegrp_portfolio') {
$r->print(&Apache::loncommon::start_page($title));
+ } else {
+ $r->print(&Apache::loncommon::start_page($title,undef,
+ {'bread_crumbs' => $brcrum}));
+ if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
+ $r->print('
'.&mt('No user portfolio available') .'
'.
+ &mt('This is a result of one of the following:').'
'.
+ '
'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'
'.
+ '
'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'
'.
+ '
');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
}
$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.'.
- '');
- }
+ # Check if access to portfolio is blocked by one or more blocking events in courses.
+ my ($blocked,$blocktext) =
+ &Apache::loncommon::blocking_status('port',$uname,$udom);
+ if ($blocked) {
+ my $evade_block;
+ # If portfolio display is in a window popped up from a "Select Portfolio Files"
+ # link in a .task resource, check if access to the task included proctor validation
+ # of check-in to a slot limited by IP.
+ # If so, and the slot is between its open and close dates, override the block.
+ if ($env{'request.course.id'} && $env{'form.symb'}) {
+ (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+ if ($res =~ /\.task$/i) {
+ my %history =
+ &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
+ $env{'user.domain'},$env{'user.name'});
+ my $version = $history{'resource.0.version'};
+ if ($history{'resource.'.$version.'.0.checkedin'}) {
+ if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
+ my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
+ if ($slot{'ip'}) {
+ if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
+ my $now = time;
+ if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
+ $evade_block = 1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ unless ($evade_block) {
+ $r->print($blocktext);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ }
+ if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
+ $r->print(
+ '
'
+ .&mt('No file was selected to upload.')
+ .' '
+ .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
+ ,'','')
+ .'
'
+ );
+ }
if ($env{'form.meta'}) {
&open_form($r,$url);
-# $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
- $r->print('Edit the meta data ');
+ $r->print(&mt('Edit the meta data').' ');
&close_form($r,$url);
}
- if ($env{'form.store'}) {
- }
-
if ($env{'form.uploaddoc.filename'}) {
if ($can_upload) {
&upload($r,$url,$group);
} else {
&missing_priv($r,$url,'upload');
}
+ } elsif ($env{'form.action'} eq 'process_overwrite') {
+ if ($can_upload) {
+ &overwrite($r,$url,$group);
+ } else {
+ &missing_priv($r,$url,'existingfile');
+ }
+ } elsif ($env{'form.action'} eq 'upload_embedded') {
+ if ($can_upload) {
+ my $disk_quota = &get_quota($group);
+ my $getpropath = 1;
+ my $current_disk_usage =
+ &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
+ my $container = &HTML::Entities::encode($env{'form.container'},'<>&"');
+ my $state = &embedded_form_elems($container).
+ '';
+ my ($result,$flag) =
+ &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
+ $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url);
+ $r->print($result.&done('Return to directory',$url));
+ } else {
+ &missing_priv($r,$url,'upload');
+ }
+ } elsif ($env{'form.action'} eq 'modify_orightml') {
+ if ($can_upload) {
+ my $result =
+ &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
+ $udom,$portfolio_root);
+ $r->print($result.
+ &done('Return to directory',$url));
+ } else {
+ &missing_priv($r,$url,'upload');
+ }
} elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_confirmed($r,$url);
+ &delete_confirmed($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url);
+ &delete($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url);
+ &delete_dir_confirmed($r,$url,$group);
} else {
&missing_priv($r,$url,'delete');
}
@@ -1861,7 +2767,7 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
if ($can_modify) {
- &rename_confirmed($r,$url);
+ &rename_confirmed($r,$url,$group);
} else {
&missing_priv($r,$url,'rename');
}
@@ -1869,15 +2775,18 @@ sub handler {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url);
+ &rename($r,$url,$group);
} else {
&missing_priv($r,$url,'rename');
}
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
- $env{'form.action'} = 'chgaccess';
- &display_access($r,$url,$group,$can_setacl,$port_path);
- } elsif ($env{'form.action'} eq 'chgaccess') {
+ if (!defined($env{'form.action'})) {
+ $env{'form.action'} = 'chgaccess';
+ }
+ &display_access($r,$url,$group,$can_setacl,$port_path,$env{'form.action'});
+ } elsif (($env{'form.action'} eq 'chgaccess') ||
+ ($env{'form.action'} eq 'chgconditions')) {
if ($can_setacl) {
&update_access($r,$url,$group,$port_path);
} else {
@@ -1891,13 +2800,23 @@ sub handler {
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url);
+ &createdir($r,$url,$group);
} else {
&missing_priv($r,$url,'upload');
}
} elsif ($env{'form.lockinfo'}) {
&lock_info($r,$url,$group);
} else {
+ if ($env{'form.action'} eq 'cancel_overwrite') {
+ if ($can_upload) {
+ my $formname = 'existingfile';
+ my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+ $env{'form.'.$formname.'.filename'} = $fname;
+ my $subdir = $port_path.$env{'form.currentpath'};
+ $subdir =~ s{(/)$}{};
+ &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir);
+ }
+ }
my $current_path='/';
if ($env{'form.currentpath'}) {
$current_path = $env{'form.currentpath'};
@@ -1906,8 +2825,9 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
$r->print(&coursegrp_portfolio_header($udom,$uname,$grp_desc));
}
- my @dir_list=&get_dir_list($portfolio_root);
- if ($dir_list[0] eq 'no_such_dir'){
+ my ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
+ if ($listerror eq 'no_such_dir'){
# two main reasons for this:
# 1) never been here, so directory structure not created
# 2) back-button navigation after deleting a directory
@@ -1922,17 +2842,25 @@ sub handler {
$current_path = '/'; # force it back to the root
}
# now grab the directory list again, for the first time
- @dir_list=&Apache::lonnet::dirlist($current_path,
- $udom,$uname,$portfolio_root);
+ ($dirlistref,$listerror) =
+ &get_dir_list($portfolio_root,$current_path,$group);
}
# 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,
- $can_upload);
- &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
+ my $is_empty;
+ if ($listerror eq 'empty') {
+ $is_empty = 1;
+ } elsif (ref($dirlistref) eq 'ARRAY') {
+ if ((scalar(@{$dirlistref}) == 2) && ($dirlistref->[0] =~ /^\.+\&/)
+ && ($dirlistref->[1] =~ /^\.+\&/)) {
+ $is_empty = 1;
+ }
+ }
+ &display_common($r,$url,$current_path,$is_empty,$dirlistref,
+ $can_upload,$group);
+ &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group,
$can_upload,$can_modify,$can_delete,$can_setacl);
- $r->print(&Apache::loncommon::end_page());
}
+ $r->print(&Apache::loncommon::end_page());
return OK;
}