'.
- 'Select Name Size Last Modified '.
+ 'Select Name Size Last Modified
');
+ if ($can_delete) {
+ $r->print('
+
');
+ $r->print(&group_form_data().'');
$r->print('');
}
@@ -332,54 +496,57 @@ sub close_form {
sub display_file {
my ($path,$filename)=@_;
my $display_file_text;
+ my $file_start='';
+ my $file_end=' ';
if (!defined($path)) { $path=$env{'form.currentpath'}; }
if (!defined($filename)) {
$filename=$env{'form.selectfile'};
- $display_file_text = ''.$path.$filename.' ';
+ $display_file_text = $file_start.$path.$filename.$file_end;
} elsif (ref($filename) eq "ARRAY") {
- foreach (@$filename) {
- $display_file_text .= ''.$path.$_.' '.$path.$filename.' ';
+ $display_file_text = $file_start.$path.$$filename.$file_end;
+ } else {
+ $display_file_text = $file_start.$path.$filename.$file_end;
}
return $display_file_text;
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url)=@_;
unless (defined $message) {
$message='Done';
}
- my $result = '';
+ my %anchor_fields = (
+ 'showversions' => $env{'form.showversions'},
+ 'currentpath' => $env{'form.currentpath'},
+ 'fieldname' => $env{'form.fieldname'},
+ 'mode' => $env{'form.mode'}
+ );
+ my $result = ''.&make_anchor($url,\%anchor_fields,&mt($message)).' ';
return $result;
}
sub delete {
- my ($r,$url,$group)=@_;
+ my ($r,$url)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $file_name = &prepend_group($file_name,$group);
+ $file_name = &prepend_group($file_name);
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
- my ($uname,$udom) = &get_name_dom($group);
+ my ($uname,$udom) = &get_name_dom();
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
- $r->print ("The file is locked and cannot be deleted.'.&mt('Delete').' '.&display_file(undef,\@files).'?
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
} else {
$r->print("No file was checked to delete. An error occured ('.$result.
- ') while trying to delete '.&display_file(undef, $delete_file).' '.
+ &mt('An error occurred ([_1]) while trying to delete
+ [_2].',$result,&display_file(undef, $delete_file)).
+ ' '.' '.&mt('Delete').' '.&display_file().'?
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
}
sub delete_dir_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
- my ($uname,$udom) = &get_name_dom($group);
- my $namespace = &get_namespace($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $namespace = &get_namespace();
+ my $port_path = &get_port_path();
my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
if ($result ne 'ok') {
- $r->print(' An error occured (dir) ('.$result.
- ') while trying to delete '.$directory_name.' An error occurred (dir) ('.$result.
+ ') while trying to delete '.$directory_name.' '.&mt('Rename').' '.&display_file().' to
');
- &close_form($r,$url,$group);
+ &close_form($r,$url);
}
}
sub rename_confirmed {
my ($r,$url,$group)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
- my ($uname,$udom) = &get_name_dom($group);
- my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom();
+ my $port_path = &get_port_path();
if ($filenewname eq '') {
- $r->print(''.
+ $r->print(''.
&mt("Error: no valid filename was provided to rename to.").
- ' An errror occured ('.$result.
- ') while trying to rename '.&display_file().' to '.
- &display_file(undef,$filenewname).' '.
+ &mt('An error occurred ([_1]) while trying to rename [_2]'
+ .' to [_3]',$result,&display_file(),
+ &display_file('',$filenewname)).' ".$env{'form.filenewname'}." to $filenewname ");
+ $r->print(&mt("The new file name was changed from:'.&display_file('',$env{'form.filenewname'}).' ',
+ ''.&display_file('',$filenewname).' '));
+ }
+ $r->print($chg_access);
+ $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('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).' '."\n");
- $r->print(&mt('Access to this file by others can be set to be one or more of the following types: public, password-protected or conditional.').''.&mt('Public files are available to anyone without the need for login.').' '.&mt('Password-protected files do not require log-in, but will require the viewer to enter the password you set.').' '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satify the conditions you set.').' '.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).' ';
+ $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 .= ' http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio .http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme '.&mt('Conditional access controls for file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).' '.
+ &explain_conditionals().'Current access controls defined for this file: '));
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_header_row());
+ $r->print(''.&mt('Access control').' '.&mt('Dates available').
+ ' '.&mt('Additional information').' ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ my $count = 1;
+ my $chg = 'none';
+ &build_access_summary($r,$count,$chg,%todisplay);
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&mt('No access control settings currently exist for this file.'.&mt($scope_desc{$scope}));
+ if ($scope eq 'course') {
+ if ($chg ne 'delete') {
+ my $cid = $content->{'domain'}.'_'.$content->{'number'};
+ my %course_description = &Apache::lonnet::coursedescription($cid);
+ $r->print(' '.&mt('Start: ').$showstart.
+ ' ');
+ if ($chg ne 'delete') {
+ if ($scope eq 'guest') {
+ $r->print(&mt('Passphrase').': '.$content->{'password'});
+ } elsif ($scope eq 'course') {
+ $r->print('');
+ $r->print(''.&mt('Roles').' '.
+ &mt('Access').' '.
+ &mt('Sections').' ');
+ $r->print(''.&mt('Groups').' ');
+ $r->print(' ');
+ foreach my $id (sort(keys(%{$content->{'roles'}}))) {
+ $r->print('');
+ foreach my $item ('role','access','section','group') {
+ $r->print('');
+ if ($item eq 'role') {
+ my $ucscope = $scope;
+ $ucscope =~ s/^(\w)/uc($1)/e;
+ my $role_output;
+ foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
+ if ($role eq 'all') {
+ $role_output .= $role.',';
+ } elsif ($role =~ /^cr/) {
+ $role_output .= (split('/',$role))[3].',';
+ } else {
+ $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
+ }
+ }
+ $role_output =~ s/,$//;
+ $r->print($role_output);
+ } else {
+ $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
+ }
+ $r->print(' ');
+ }
+ $r->print(' ');
+ }
+ $r->print('
');
+ } elsif ($scope eq 'domains') {
+ $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
+ } elsif ($scope eq 'users') {
+ my $curr_user_list = &sort_users($content->{'users'});
+ $r->print(&mt('Users: ').$curr_user_list);
+ } else {
+ $r->print(' ');
+ }
+ } else {
+ $r->print(' ');
+ }
+ $r->print(' ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
}
+
sub update_access {
- my ($r,$url,$group) = @_;
- my $function = &Apache::loncommon::get_users_function();
- my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
+ my ($r,$url,$group,$port_path) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -528,10 +953,10 @@ sub update_access {
}
}
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
- $r->print(''.&mt('Allowing others to retrieve portfolio file: [_1]',
- $file_name).' '."\n");
- $file_name = &prepend_group($file_name,$group);
- my ($uname,$udom) = &get_name_dom($group);
+ $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 ($errors,$outcome,$deloutcome,$new_values,$translation);
if ($totalprocessed) {
($outcome,$deloutcome,$new_values,$translation) =
@@ -557,7 +982,9 @@ sub update_access {
if (@{$processing{$chg}} > 0) {
if ($chg eq 'delete') {
if (!($deloutcome eq 'ok')) {
- $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+ $errors .=''.
+ &mt('A problem occurred deleting access controls: [_1]',$deloutcome).
+ ' ';
next;
}
}
@@ -566,100 +993,24 @@ sub update_access {
$r->print(''.&mt($title{$chg}).
'. ');
my $count = 0;
+ my %todisplay;
foreach my $key (sort(keys(%{$$changes{$chg}}))) {
- if ($count) {
- $r->print(&Apache::loncommon::start_data_table_row());
- }
- my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+ my ($num,$scope,$end,$start) = &unpack_acc_key($key);
my $newkey = $key;
if ($chg eq 'activate') {
$newkey =~ s/^(\d+)/$$translation{$1}/;
}
- my $content = $$updated_controls{$newkey};
- if ($chg eq 'delete') {
- $showstart = &mt('Deleted');
- $showend = $showstart;
- } else {
- $showstart = localtime($start);
- if ($end == 0) {
- $showend = &mt('No end date');
- } else {
- $showend = localtime($end);
- }
- }
- $r->print(''.&mt($scope));
- if (($scope eq 'course') || ($scope eq 'group')) {
- if ($chg ne 'delete') {
- my $cid = $content->{'domain'}.'_'.$content->{'number'};
- my %course_description = &Apache::lonnet::coursedescription($cid);
- $r->print(' '.&mt('Start: ').$showstart.
- ' ');
- if ($chg ne 'delete') {
- if ($scope eq 'guest') {
- $r->print(&mt('Password').': '.$content->{'password'});
- } elsif ($scope eq 'course' || $scope eq 'group') {
- $r->print('');
- $r->print(''.&mt('Roles').' '.
- &mt('Access').' '.
- &mt('Sections').' ');
- if ($scope eq 'course') {
- $r->print(''.&mt('Groups').' ');
- } else {
- $r->print(''.&mt('Teams').' ');
- }
- $r->print(' ');
- foreach my $id (sort(keys(%{$content->{'roles'}}))) {
- $r->print('');
- foreach my $item ('role','access','section','group') {
- $r->print('');
- if ($item eq 'role') {
- my $ucscope = $scope;
- $ucscope =~ s/^(\w)/uc($1)/;
- my $role_output;
- foreach my $role (@{$content->{'roles'}{$id}{$item}}) {
- if ($role eq 'all') {
- $role_output .= $role.',';
- } elsif ($role =~ /^cr/) {
- $role_output .= (split('/',$role))[3].',';
- } else {
- $role_output .= &Apache::lonnet::plaintext($role,$ucscope).',';
- }
- }
- $role_output =~ s/,$//;
- $r->print($role_output);
- } else {
- $r->print(join(',',@{$content->{'roles'}{$id}{$item}}));
- }
- $r->print(' ');
- }
- }
- $r->print(&Apache::loncommon::end_data_table_row());
- $r->print(&Apache::loncommon::end_data_table());
- } elsif ($scope eq 'domains') {
- $r->print(&mt('Domains: ').join(',',@{$content->{'dom'}}));
- } elsif ($scope eq 'users') {
- my $curr_user_list = &sort_users($content->{'users'});
- $r->print(&mt('Users: ').$curr_user_list);
- } else {
- $r->print(' ');
- }
- } else {
- $r->print(' ');
- }
- $r->print('');
- $r->print(&Apache::loncommon::end_data_table_row());
- $count ++;
+ $todisplay{$scope}{$newkey} = $$updated_controls{$newkey};
}
+ &build_access_summary($r,$count,$chg,%todisplay);
}
}
$r->print(&Apache::loncommon::end_data_table());
} else {
if ((@{$processing{'activate'}} > 0) || (@{$processing{'update'}} > 0)) {
- $errors .= &mt('A problem occurred storing access control settings: [_1]',$outcome);
+ $errors .= ''.
+ &mt('A problem occurred saving access control settings: [_1]',$outcome).
+ ' ';
}
}
if ($errors) {
@@ -670,14 +1021,14 @@ sub update_access {
my $totalnew = 0;
my $status = 'new';
my ($firstitem,$lastitem);
- foreach my $newitem ('course','group','domains','users') {
+ foreach my $newitem ('course','domains','users') {
$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,$group);
- foreach my $newitem ('course','group','domains','users') {
+ &open_form($r,$url);
+ foreach my $newitem ('course','domains','users') {
if ($env{'form.new'.$newitem} > 0) {
$r->print('[_1]-based access control for portfolio file: [_2] ',$newitem,$env{'form.currentpath'}.$env{'form.selectfile'}).''.
- &mt('Display all access settings for this file').' ');
+ my %anchor_fields = (
+ 'currentpath' => $env{'form.currentpath'},
+ 'access' => $env{'form.selectfile'}
+ );
+ $r->print('');
- $r->print(''.&mt('Public access:').' '.$publictext.' ');
+ if ($action eq 'chgaccess') {
+ &standard_settings($r,$now,$then,$url,$filename,\%acl_count,\%start,
+ \%end,$public,$publicnum,$publictext,$guest,$guestnum,
+ $guesttext,$access_controls,%conditionals);
+ } else {
+ &condition_setting($r,$access_controls,$now,$then,\%acl_count,
+ \@domains,\@users,\@courses);
+ }
+ $r->print('
');
+}
+
+sub standard_settings {
+ my ($r,$now,$then,$url,$filename,$acl_count,$start,$end,$public,$publicnum,
+ $publictext,$guest,$guestnum,$guesttext,$access_controls,%conditionals)=@_;
+ $r->print(''.&mt('Public access: [_1]',$publictext).' ');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(''.&mt('Action').' '.&mt('Dates available').' ');
@@ -837,7 +1206,7 @@ sub access_setting_table {
$r->print(&Apache::loncommon::start_data_table_row());
if ($public) {
$r->print(''.&actionbox('old',$publicnum,'public').' '.
- &dateboxes($publicnum,$start{$public},$end{$public}).' ');
+ &dateboxes($publicnum,$start->{$public},$end->{$public}).'');
} else {
$r->print(''.&actionbox('new','0','public').' '.
&dateboxes('0',$now,$then).' ');
@@ -845,18 +1214,18 @@ sub access_setting_table {
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
$r->print(' ');
- $r->print(''.&mt('Password-protected access:').' '.$guesttext.' ');
+ $r->print(''.&mt('Passphrase-protected access: [_1]',$guesttext).' ');
$r->print(&Apache::loncommon::start_data_table());
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(' '.&mt('Action').' '.&mt('Dates available').
- ' '. &mt('Password').' ');
+ ''. &mt('Passphrase').' ');
$r->print(&Apache::loncommon::end_data_table_header_row());
$r->print(&Apache::loncommon::start_data_table_row());
my $passwd;
if ($guest) {
$passwd = $$access_controls{$guest}{'password'};
$r->print(''.&actionbox('old',$guestnum,'guest').' '.
- &dateboxes($guestnum,$start{$guest},$end{$guest}).' ');
+ &dateboxes($guestnum,$start->{$guest},$end->{$guest}).'');
} else {
$r->print(''.&actionbox('new','1','guest').' '.
&dateboxes('1',$now,$then).' ');
@@ -865,36 +1234,75 @@ sub access_setting_table {
$passwd.'" />');
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
- $r->print(' ');
- &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then);
+ $r->print(' ');
+ my $numconditionals = 0;
+ my $conditionstext;
+ my %cond_status;
+ foreach my $scope ('domains','users','course') {
+ $numconditionals += $acl_count->{$scope};
+ if ($acl_count->{$scope} > 0) {
+ if ($conditionstext ne 'Active') {
+ foreach my $key (keys(%{$conditionals{$scope}})) {
+ $conditionstext = &acl_status($start->{$key},$end->{$key},$now);
+ if ($conditionstext eq 'Active') {
+ last;
+ }
+ }
+ }
+ }
+ }
+ if ($conditionstext eq '') {
+ $conditionstext = 'Off';
+ }
+ my %anchor_fields = (
+ 'access' => $env{'form.selectfile'},
+ 'action' => 'chgconditions',
+ 'currentpath' => $env{'form.currentpath'},
+ );
+ $r->print(''.&mt('Conditional access: [_1]',$conditionstext).' ');
+ if ($numconditionals > 0) {
+ my $count = 1;
+ my $chg = 'none';
+ $r->print(&mt('You have previously set [_1] conditional access controls.',$numconditionals).' '.&make_anchor($url,\%anchor_fields,&mt('Change Conditions')).' '.&mt('Access control').' '.&mt('Dates available').
+ ' '.&mt('Additional information').' ');
+ $r->print(&Apache::loncommon::end_data_table_header_row());
+ &build_access_summary($r,$count,$chg,%conditionals);
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print(&make_anchor($url,\%anchor_fields,&mt('Add conditional access')).' '.&mt('based on domain, username, or course affiliation.'));
+ }
+}
+
+sub condition_setting {
+ my ($r,$access_controls,$now,$then,$acl_count,$domains,$users,$courses) = @_;
+ $r->print('');
+ &access_element($r,'domains',$acl_count,$domains,$access_controls,$now,$then);
$r->print(' ');
- &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then);
+ &access_element($r,'users',$acl_count,$users,$access_controls,$now,$then);
$r->print(' ');
- if (@courses > 0 || @groups > 0) {
+ if ($acl_count->{course} > 0) {
$r->print('');
} else {
$r->print(' ');
}
- &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then);
+ &access_element($r,'course',$acl_count,$courses,$access_controls,$now,$then);
$r->print(' ');
- if (@courses > 0 || @groups > 0) {
- $r->print(' ');
- } else {
- $r->print(' ');
- }
- &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then);
$r->print('
');
}
sub acl_status {
my ($start,$end,$now) = @_;
if ($start > $now) {
- return &mt('Inactive');
+ return 'Inactive';
}
if ($end && $end<$now) {
- return &mt('Inactive');
+ return 'Inactive';
}
- return &mt('Active');
+ return 'Active';
}
sub access_element {
@@ -922,7 +1330,6 @@ sub display_access_row {
my ($r,$status,$type,$items,$access_controls,$now,$then) = @_;
if (@{$items} > 0) {
my @all_doms;
- my $tablecolor;
my $colspan = 3;
my $uctype = $type;
$uctype =~ s/^(\w)/uc($1)/e;
@@ -930,29 +1337,26 @@ sub display_access_row {
$r->print(&Apache::loncommon::start_data_table_header_row());
$r->print(' '.&mt('Action?').' '.&mt($uctype).' '.
&mt('Dates available').' ');
- if (($type eq 'course') || ($type eq 'group')) {
+ if ($type eq 'course' && $status eq 'old') {
$r->print(''.&mt('Allowed [_1] member affiliations',$type).
' ');
$colspan ++;
- my $function = &Apache::loncommon::get_users_function();
- $tablecolor=&Apache::loncommon::designparm($function.'.tabbg');
} elsif ($type eq 'domains') {
- @all_doms = &Apache::loncommon::get_domains();
+ @all_doms = sort(&Apache::lonnet::all_domains());
}
$r->print(&Apache::loncommon::end_data_table_header_row());
- $r->print(&Apache::loncommon::start_data_table_row());
foreach my $key (@{$items}) {
- if (($type eq 'course') || ($type eq 'group')) {
- &course_row($r,$status,$type,$key,$access_controls,
- $tablecolor,$now,$then);
+ $r->print(&Apache::loncommon::start_data_table_row());
+ if ($type eq 'course') {
+ &course_row($r,$status,$type,$key,$access_controls,$now,$then);
} elsif ($type eq 'domains') {
&domains_row($r,$status,$key,\@all_doms,$access_controls,$now,
$then);
} elsif ($type eq 'users') {
&users_row($r,$status,$key,$access_controls,$now,$then);
}
+ $r->print(&Apache::loncommon::end_data_table_row());
}
- $r->print(&Apache::loncommon::end_data_table_row());
if ($status eq 'old') {
$r->print(&Apache::loncommon::start_data_table_row());
$r->print(''.&additional_item($type).
@@ -970,34 +1374,37 @@ sub display_access_row {
sub course_js {
return qq|
END_SCRIPT
$r->print(&mt('Select roles, course status, section(s) and group(s) for users who will be able to access the portfolio file.'));
@@ -1260,7 +1700,7 @@ END_SCRIPT
}
sub select_files {
- my ($r,$group) = @_;
+ my ($r) = @_;
if ($env{'form.continue'} eq 'true') {
# here we update the selections for the currentpath
# eventually, have to handle removing those not checked, but . . .
@@ -1288,126 +1728,224 @@ ENDSMP
fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
}
}
- opener.document.forms.lonhomework.
-ENDSMP
- $javascript .= $env{'form.fieldname'};
- $javascript .= (<
ENDSMP
$r->print($javascript);
- $r->print("Select portfolio files
- Check as many as you wish in response to the problem.".&mt('Select portfolio files')." ".
+ &mt('Check as many as you wish in response to the problem.')."Files selected from other directories: ".&mt('Files selected from other directories:')." Unable to upload '.$fname.' (size = '.$filesize.' kilobytes) . Disk quota will be exceeded.'.
- 'Unable to upload '.$fname.' , a locked file by that name was found in '.$port_path.$env{'form.currentpath'}.' '.
- 'Unable to upload '.$fname.' , a file by that name was found in '.$port_path.$env{'form.currentpath'}.' '.
- ' An errror occured ('.$result.
- ') while trying to upload '.&display_file().' '.
+ &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.',''.$fname.' ',$filesize).' '.
+ '';
+ $msg .= &mt('Unable to upload [_1] a locked file by that name was found in [_2].',''.$fname.' ',''.$port_path.$env{'form.currentpath'}.' ');
+ $msg .= ' '.$fname.' ');
+ return ('file_locked',$msg);
+ } else {
+ my $msg = '';
+ $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].',''.$fname.' ',$port_path.$env{'form.currentpath'});
+ $msg .= ' ';
+ $msg .= ''.$fname.' ', $port_path.$env{'form.currentpath'});
+ return ('file_exists',$msg);
+ }
+ }
+}
+
+sub upload {
+ my ($r,$url,$group)=@_;
+ my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
+
+ my ($state,$msg) = &check_for_upload($env{'form.currentpath'},
+ $fname,$group,'uploaddoc');
+
+ if ($state eq 'will_exceed_quota'
+ || $state eq 'file_locked'
+ || $state eq 'file_exists' ) {
+ $r->print($msg.&done('Back',$url));
+ return;
+ }
+
+ my $port_path = &get_port_path();
+ my (%allfiles,%codebase,$mode);
+ if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
+ $mode = 'parse';
+
+ }
+ my $result=
+ &Apache::lonnet::userfileupload('uploaddoc','',
+ $port_path.$env{'form.currentpath'},
+ $mode,\%allfiles,\%codebase);
+ if ($result !~ m|^/uploaded/|) {
+ $r->print(''.'An error occurred ('.$result.
+ ') while trying to upload '.&display_file().' ".&mt("Reference Warning")." ");
+ $r->print("".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."
");
+ $r->print("".&mt("Please select the locations from which the referenced files are to be uploaded.")."
");
+ $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
+ {'error_on_invalid_names' => 1,
+ 'ignore_remote_references' => 1,}));
+ $r->print('Or '.&done('Return to directory listing',$url).'
');
+ } else {
+ $r->print(&done(undef,$url));
+ }
}
}
+
+sub upload_embedded {
+ my ($r,$url,$group)=@_;
+ for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {
+ next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));
+ my $orig_uploaded_filename =
+ $env{'form.embedded_item_'.$i.'.filename'};
+
+ $env{'form.embedded_orig_'.$i} =
+ &unescape($env{'form.embedded_orig_'.$i});
+ my ($path,$fname) =
+ ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});
+ # no path, whole string is fname
+ if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };
+
+ $path = $env{'form.currentpath'}.$path;
+ $fname = &Apache::lonnet::clean_filename($fname);
+
+ my ($state,$msg) = &check_for_upload($path,$fname,$group,
+ 'embedded_item_'.$i);
+
+ if ($state eq 'will_exceed_quota'
+ || $state eq 'file_locked'
+ || $state eq 'file_exists' ) {
+ $r->print($msg);
+ next;
+ }
+
+ my $port_path = &get_port_path();
+ my $src_path = $env{'form.embedded_orig_'.$i};
+ $env{'form.embedded_item_'.$i.'.filename'}=$fname;
+
+ my $result=
+ &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
+ $port_path.$path);
+ if ($result !~ m|^/uploaded/|) {
+ $r->print(''.'An error occurred ('.$result.
+ ') while trying to upload '.$orig_uploaded_filename.' for embedded element '.$env{'form.embedded_orig_'.$i}.' Uploaded ".
+ &display_file($port_path.$path,$fname).'
');
+ }
+ }
+ $r->print(&done(undef,$url));
+}
+
sub lock_info {
my ($r,$url,$group) = @_;
- my ($uname,$udom) = &get_name_dom($group);
+ my ($uname,$udom) = &get_name_dom();
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
my $file_name = $env{'form.lockinfo'};
- $file_name = &prepend_group($file_name,$group);
+ $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]).
- ' [_1] '.$env{'form.lockinfo'}.
+ ' (group: '.$group.')';
+ } else {
+ $filetext = ''.$file_name.' ';
+ }
+
+ my $title =''.&Apache::lonnet::gettitle($$array_item[0]).
+ ' [_1] '.
+ $r->print(''.
&mt("Error: no directory name was provided.").
- ' Unable to create a directory named '.$newdir.
- ' a file or directory by that name already exists. '.&mt('Unable to create a directory named').' '.$newdir.
+ ' '.&mt('a file or directory by that name already exists.').' An errror occured ('.$result.
- ') while trying to create a new directory '.&display_file().' '.'An error occurred ('.$result.
+ ') while trying to create a new directory '.&display_file().' ".$env{'form.newdir'}." to $newdir ");
+ $r->print(&mt("The new directory name was changed from:").$env{'form.newdir'}." ".&mt('to')." $newdir ");
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url));
}
sub get_portfolio_root {
- my ($group) = @_;
- my ($portfolio_root,$udom,$uname,$path);
- ($uname,$udom) = &get_name_dom($group);
+ my ($udom,$uname,$group) = @_;
+ if (!(defined($udom)) || !(defined($uname))) {
+ ($uname,$udom) = &get_name_dom();
+ }
+ my $path = '/userfiles/portfolio';
+ if (!defined($group)) {
+ if (defined($env{'form.group'})) {
+ $group = $env{'form.group'};
+ }
+ }
if (defined($group)) {
$path = '/userfiles/groups/'.$group.'/portfolio';
- } else {
- $path = '/userfiles/portfolio';
- }
+ }
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);
- return &Apache::lonnet::dirlist($env{'form.currentpath'},
- $udom,$uname,$portfolio_root);
+ my ($portfolio_root,$path) = @_;
+ $path ||= $env{'form.currentpath'};
+ my ($uname,$udom) = &get_name_dom();
+ return &Apache::lonnet::dirlist($path,$udom,$uname,$portfolio_root);
}
sub get_name_dom {
- my ($group) = @_;
my ($uname,$udom);
- if (defined($group)) {
+ if (defined($env{'form.group'})) {
$udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$uname = $env{'course.'.$env{'request.course.id'}.'.num'};
} else {
@@ -1467,46 +2026,117 @@ sub get_name_dom {
}
sub prepend_group {
- my ($filename,$group) = @_;
- if (defined($group)) {
- $filename = $group.'/'.$filename;
+ my ($filename) = @_;
+ if (defined($env{'form.group'})) {
+ $filename = $env{'form.group'}.$filename;
}
return $filename;
}
sub get_namespace {
- my ($group) = @_;
my $namespace = 'portfolio';
- if (defined($group)) {
- my ($uname,$udom) = &get_name_dom($group);
- $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+ if (defined($env{'form.group'})) {
+ my ($uname,$udom) = &get_name_dom();
+ $namespace .= '_'.$udom.'_'.$uname.'_'.$env{'form.group'};
}
return $namespace;
}
sub get_port_path {
- my ($group) = @_;
my $port_path;
- if (defined($group)) {
- $port_path = "groups/$group/portfolio";
+ if (defined($env{'form.group'})) {
+ $port_path = "groups/$env{'form.group'}/portfolio";
} else {
$port_path = 'portfolio';
}
return $port_path;
}
+sub missing_priv {
+ my ($r,$url,$priv) = @_;
+ 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(' No file was selected to upload.'.
- 'To upload a file, click Browse... '.
- ', select a file, then click Upload , ');
+ $r->print('');
+ $r->print(&mt('No file was selected to upload. '));
+ $r->print(&mt('To upload a file, click Browse... select a file, then click Upload .'));
+ $r->print(' ');
}
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