--- loncom/interface/portfolio.pm 2004/10/11 22:52:20 1.47
+++ loncom/interface/portfolio.pm 2006/06/16 22:37:10 1.104
@@ -29,159 +29,143 @@ use Apache::lonnet;
use Apache::lontexconvert;
use Apache::lonfeedback;
use Apache::lonlocal;
+use Apache::lonnet;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl';
+use LONCAPA;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
- my ($filename, $current_path) = @_;
- my $anchor = ''.$filename.' ';
+ my ($url, $filename, $current_path, $current_mode, $field_name,
+ $continue_select,$group) = @_;
+ if ($continue_select ne 'true') {$continue_select = 'false'};
+ my $anchor = ''.$filename.' ';
return $anchor;
}
my $dirptr=16384;
-sub display_directory {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
+sub display_common {
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
+ my $groupitem;
+ my $namespace = &get_namespace($group);
+ my $port_path = &get_port_path($group);
+ if (defined($group)) {
+ $groupitem = ' ';
+ }
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- $r->print('
');
- $r->print('');
- my $displayOut = '';
- $r->print($displayOut);
- $r->print(' ');
- $displayOut = '';
- $r->print($displayOut);
- $r->print('
');
+ my %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+ 'upload_label' =>
+ 'Upload file to current directory:',
+ 'createdir' => 'Create Subdirectory',
+ 'createdir_label' =>
+ 'Create subdirectory in current directory:');
+ $r->print(<<"TABLE");
+
+TABLE
my @tree = split (/\//,$current_path);
- $r->print(''.&make_anchor('portfolio','/').'/');
+ $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++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+ $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
}
}
$r->print(' ');
- &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
- #Fixme -- remove from recent those paths that are deleted
- $r->print(' ");
- if ($is_empty && ($current_path ne '/')) {
- $displayOut = '';
-
- $r->print($displayOut);
- return;
- }
- $r->print(''.
- 'Actions Name Size Last Modified ');
- my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
- foreach my $line (sort
- {
- my ($afile)=split('&',$a,2);
- my ($bfile)=split('&',$b,2);
- return (lc($afile) cmp lc($bfile));
- } (@$dir_list)) {
- #$strip holds directory/file name
- #$dom
- my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
- if (($filename ne '.') && ($filename ne '..')) {
- if ($dirptr&$testdir) {
- $r->print(' ');
- $r->print('Go to ... ');
- $r->print(''.&make_anchor($filename.'/',$current_path.$filename.'/').' ');
- $r->print(' ');
- } else {
- $r->print('');
- $r->print('
-
- ');
- $r->print(' ');
- $r->print(''.
- $filename.' ');
- $r->print(''.$size.' ');
- $r->print(''.&Apache::lonlocal::locallocaltime($mtime).' ');
- $r->print(' ');
- }
- }
- }
-# pink bg
-# blue bg
-# $r->print(&display_directory($current_path, $currentFile, @dir_list));
-# $r->print('>');
-# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
- $r->print('
');
}
-sub display_file_select {
- my ($r,$current_path,$is_empty,$dir_list)=@_;
+sub display_directory {
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
- $r->print('');
- $r->print('');
- my $displayOut = '';
- $r->print($displayOut);
- $r->print(' ');
- $displayOut = '';
- $r->print($displayOut);
- $r->print('
');
- my @tree = split (/\//,$current_path);
- $r->print(''.&make_anchor('portfolio','/').'/');
- if (@tree > 1){
- my $newCurrentPath = '';
- for (my $i = 1; $i< @tree; $i++){
- $newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
- }
- }
- $r->print(' ');
- &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
- #Fixme -- remove from recent those paths that are deleted
- $r->print(' ");
+ my ($groupitem,$groupecho);
+ my $display_out;
+ my $select_mode;
+ my $checked_files;
+ my $port_path = &get_port_path($group);
+ my ($uname,$udom) = &get_name_dom($group);
+ if (defined($group)) {
+ $groupitem = ' ';
+ $groupecho = '&group='.$group;
+ }
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash(
+ $current_permissions,$group);
+ my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group);
+ my $now = time;
+ if ($env{"form.mode"} eq 'selectfile'){
+ &select_files($r);
+ $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
+ $select_mode = 'true';
+ }
if ($is_empty && ($current_path ne '/')) {
- $displayOut = '';
- $r->print($displayOut);
+ $r->print($display_out);
return;
}
- $r->print('
+
+
+
+ ');
+ }
}
sub open_form {
- my ($r)=@_;
- $r->print('');
+ my ($r,$url)=@_;
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ $r->print(' ');
$r->print(' ');
+ $env{'form.action'}.'" />');
$r->print(' ');
- $r->print(' ');
+ foreach (@files) {
+ $r->print(' ');
+ }
$r->print(' ');
+ $env{'form.currentpath'}.'" />');
}
sub close_form {
- my ($r)=@_;
- $r->print('
');
- $r->print('
+ my ($r,$url,$group)=@_;
+ $r->print(' ');
+ if (defined($group)) {
+ $r->print("\n".' ');
+ }
+ $r->print('
');
+ $r->print('
-
-
');
-
+ $env{'form.currentpath'}.'" />');
+ if (defined($group)) {
+ $r->print("\n".' ');
+ }
+ $r->print("\n".'
+ ');
}
sub display_file {
my ($path,$filename)=@_;
- if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
- if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
- return ''.$path.$filename.' ';
+ my $display_file_text;
+ if (!defined($path)) { $path=$env{'form.currentpath'}; }
+ if (!defined($filename)) {
+ $filename=$env{'form.selectfile'};
+ $display_file_text = ''.$path.$filename.' ';
+ } elsif (ref($filename) eq "ARRAY") {
+ foreach (@$filename) {
+ $display_file_text .= ''.$path.$_.' ';
+ }
+ } elsif (ref($filename) eq "SCALAR") {
+ $display_file_text = ''.$path.$filename.' ';
+ }
+ return $display_file_text;
}
sub done {
- return ('');
+ my ($message,$url,$group)=@_;
+ unless (defined $message) {
+ $message='Done';
+ }
+ my $result = '';
+ return $result;
}
sub delete {
- my ($r)=@_;
- &open_form($r);
- $r->print(''.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ my ($r,$url,$group)=@_;
+ my @check;
+ my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
+ $file_name = &prepend_group($file_name,$group);
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ 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. ");
+ $r->print(&done('Back',$url,$group));
+ } else {
+ if (scalar(@files)) {
+ &open_form($r,$url);
+ $r->print(''.&mt('Delete').' '.&display_file(undef,\@files).'?
');
+ &close_form($r,$url,$group);
+ } else {
+ $r->print("No file was checked to delete. ");
+ $r->print(&done(undef,$url,$group));
+ }
+ }
}
sub delete_confirmed {
- my ($r)=@_;
- my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
- $ENV{'form.currentpath'}.
- $ENV{'form.selectfile'});
- if ($result ne 'ok') {
+ my ($r,$url,$group)=@_;
+ my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+ my $result;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $port_path = &get_port_path($group);
+ foreach my $delete_file (@files) {
+ $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
+ $env{'form.currentpath'}.
+ $delete_file);
+ if ($result ne 'ok') {
$r->print(' An error occured ('.$result.
- ') while trying to delete '.&display_file().' ');
+ ') while trying to delete '.&display_file(undef, $delete_file).' ');
+ }
}
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
}
sub delete_dir {
- my ($r)=@_;
- &open_form($r);
+ my ($r,$url,$group)=@_;
+ &open_form($r,$url);
$r->print(''.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ &close_form($r,$url,$group);
}
sub delete_dir_confirmed {
- my ($r)=@_;
- my $directory_name = $ENV{'form.currentpath'};
- $directory_name =~ m/\/$/;
- $directory_name = $`;
- my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.
+ my ($r,$url,$group)=@_;
+ 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 $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
$directory_name);
if ($result ne 'ok') {
@@ -302,7 +385,7 @@ sub delete_dir_confirmed {
} else {
# now remove from recent
# $r->print(' removing '.$directory_name.' print(&done());
+ $r->print(&done(undef,$url,$group));
}
sub rename {
- my ($r)=@_;
- &open_form($r);
- $r->print(''.&mt('Rename').' '.&display_file().' to
- ?
');
- &close_form($r);
+ my ($r,$url,$group)=@_;
+ 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. ");
+ $r->print(&done(undef,$url,$group));
+ } else {
+ &open_form($r,$url);
+ $r->print(''.&mt('Rename').' '.&display_file().' to
+ ?
');
+ &close_form($r,$url,$group);
+ }
}
sub rename_confirmed {
- my ($r)=@_;
- my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
+ 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);
if ($filenewname eq '') {
$r->print(''.
&mt("Error: no valid filename was provided to rename to.").
' ');
- $r->print(&done());
+ $r->print(&done(undef,$url,$group));
return;
}
my $result=
- &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
- 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
- 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
+ &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(' An errror occured ('.$result.
') while trying to rename '.&display_file().' to '.
&display_file(undef,$filenewname).' ');
}
- $r->print(&done());
+ if ($filenewname ne $env{'form.filenewname'}) {
+ $r->print("The new file name was changed from:".$env{'form.filenewname'}." to $filenewname ");
+ }
+ $r->print(&done(undef,$url,$group));
+}
+
+sub display_access {
+ my ($r,$url,$group) = @_;
+ my ($uname,$udom) = &get_name_dom($group);
+ my $file_name = $env{'form.currentpath'}.$env{'form.access'};
+ $file_name = &prepend_group($file_name,$group);
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
+ $uname);
+ my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
+ &open_form($r,$url);
+ $r->print(''.&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 the following types: public.').''.&mt('Public files are available to anyone without the need for login.').' ');
+ &access_setting_table($r,$access_controls{$file_name});
+ &close_form($r,$url,$group);
+}
+
+sub update_access {
+ my ($r,$url,$group) = @_;
+ my $totalprocessed = 0;
+ my %processing;
+ my %title = (
+ 'activate' => 'New controls added',
+ 'delete' => 'Existing controls deleted',
+ 'update' => 'Existing controls modified',
+ );
+ my $changes;
+ foreach my $chg (sort(keys(%title))) {
+ @{$processing{$chg}} = &Apache::loncommon::get_env_multiple('form.'.$chg);
+ $totalprocessed += @{$processing{$chg}};
+ foreach my $num (@{$processing{$chg}}) {
+ my $scope = $env{'form.scope_'.$num};
+ my ($start,$end) = &get_dates_from_form($num);
+ my $newkey = $num.':'.$scope.'_'.$end.'_'.$start;
+ if ($chg eq 'delete') {
+ $$changes{$chg}{$newkey} = 1;
+ } else {
+ $$changes{$chg}{$newkey} =
+ &build_access_record($num,$scope,$start,$end);
+ }
+ }
+ }
+ 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);
+ my ($errors,$outcome,$deloutcome,$new_values,$translation);
+ if ($totalprocessed) {
+ ($outcome,$deloutcome,$new_values,$translation) =
+ &Apache::lonnet::modify_access_controls($file_name,$changes,$udom,$uname);
+ }
+ my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom, $uname);
+ my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
+ if ($totalprocessed) {
+ if ($outcome eq 'ok') {
+ my $updated_controls = $access_controls{$file_name};
+ my ($showstart,$showend);
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(''.&mt('Type of change').' '.&mt('Access control').' '.&mt('Start date').' '.&mt('End date').' ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ foreach my $chg (sort(keys(%processing))) {
+ if (@{$processing{$chg}} > 0) {
+ if ($chg eq 'delete') {
+ if (!($deloutcome eq 'ok')) {
+ $errors .= &mt('A problem occurred deleting access controls: [_1]',$deloutcome);
+ next;
+ }
+ }
+ my $numchgs = @{$processing{$chg}};
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(''.&mt($title{$chg}).'. ');
+ my $count = 0;
+ foreach my $key (sort(keys(%{$$changes{$chg}}))) {
+ if ($count) {
+ $r->print(&Apache::loncommon::start_data_table_row());
+ }
+ my ($num,$scope,$end,$start) =
+ ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+ my $newkey = $key;
+ if ($chg eq 'activate') {
+ $newkey =~ s/^(\d+)/$$translation{$1}/;
+ }
+ my %content = &Apache::lonnet::parse_access_controls(
+ $$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).' '.$showstart.
+ ' '. $showend.' ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $count ++;
+ }
+ }
+ }
+ $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);
+ }
+ }
+ if ($errors) {
+ $r->print($errors);
+ }
+ }
+ $r->print(''.&mt('Display all access settings for this file').' ');
+ return;
+}
+
+sub build_access_record {
+ my ($num,$scope,$start,$end) = @_;
+ my $record = ''.$start.' '.$end.
+ ' ';
+ return $record;
+}
+
+sub get_dates_from_form {
+ my ($id) = @_;
+ my $startdate;
+ my $enddate;
+ $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$id);
+ $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$id);
+ if ( exists ($env{'form.noend_'.$id}) ) {
+ $enddate = 0;
+ }
+ return ($startdate,$enddate);
+}
+
+sub access_setting_table {
+ my ($r,$access_controls) = @_;
+ my ($public,$publictext);
+ $publictext = ''.&mt('Off').' ';
+ my ($guest,$guesttext);
+ $guesttext = ''.&mt('Off').' ';
+ my @courses = ();
+ my @groups = ();
+ my @domains = ();
+ my @users = ();
+ my $now = time;
+ my $then = $now + (60*60*24*180); # six months approx.
+ foreach my $key (sort(keys(%{$access_controls}))) {
+ my ($scope) = ($key =~ /^[^:]+:([a-z]+)_\d*_?\d*$/);
+ if ($scope eq 'public') {
+ $public = $key;
+ $publictext = ''.&mt('On').' ';
+ }
+ }
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print(''.&mt('Access Type').' '.
+ &mt('Settings').' '."\n");
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ $r->print('Public '.$publictext.'');
+ $r->print(&Apache::loncommon::start_data_table());
+ $r->print(&Apache::loncommon::start_data_table_row());
+ my ($pub_startdate,$pub_enddate,$pub_action,$pub_noend);
+ if ($public) {
+ my ($num,$end,$start) = ($public =~ /^([^:]+):[a-z]+_(\d*)_?(\d*)$/);
+ if ($end == 0) {
+ $pub_noend = 'checked="checked"';
+ }
+ $pub_action = ' '.&mt('Delete').' '.&mt('Update').
+ ' ';
+ $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'startdate_'.$num,$start,undef,undef,undef,1,undef,
+ undef,undef,1);
+ $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'enddate_'.$num,$end,undef,undef,undef,1,undef,
+ undef,undef,1).
+ ' '.&mt('No end date').' ';
+ } else {
+ $pub_action = ' '.
+ &mt('Activate').
+ ' ';
+ $pub_startdate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'startdate_0',$now,undef,undef,undef,1,undef,
+ undef,undef,1);
+ $pub_enddate = &Apache::lonhtmlcommon::date_setter('portform',
+ 'enddate_0',$then,,undef,undef,undef,1,undef,
+ undef,undef,1).
+ '   '.&mt('No end date').
+ ' ';
+
+ }
+ $r->print(''.$pub_action.' '.&mt('Start: ').$pub_startdate.
+ ' '.&mt('End: ').$pub_enddate.' ');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
+ $r->print('');
+ $r->print(&Apache::loncommon::end_data_table_row());
+ $r->print(&Apache::loncommon::end_data_table());
}
+
sub select_files {
- my ($r)=@_;
+ my ($r,$group) = @_;
+ if ($env{'form.continue'} eq 'true') {
+ # here we update the selections for the currentpath
+ # eventually, have to handle removing those not checked, but . . .
+ my @items=&Apache::loncommon::get_env_multiple('form.checkfile');
+ if (scalar(@items)){
+ &Apache::lonnet::save_selected_files($env{'user.name'}, $env{'form.currentpath'}, @items);
+ }
+ } else {
+ #empty the file for a fresh start
+ &Apache::lonnet::clear_selected_files($env{'user.name'});
+ }
+ my @files = &Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+ my $java_files = join ",", @files;
+ if ($java_files) {
+ $java_files.=',';
+ }
+ my $javascript =(<
+ function finishSelect() {
+ENDSMP
+ $javascript .= 'fileList = "'.$java_files.'";';
+ $javascript .= (<
+ENDSMP
+ $r->print($javascript);
$r->print("Select portfolio files
- Check as many as you wish in response to the essay problem. ");
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
- '/userfiles/portfolio';
- my $current_path='/';
- if ($ENV{'form.currentpath'}) {
- $current_path = $ENV{'form.currentpath'};
- }
- my @dir_list=&Apache::lonnet::dirlist($current_path,
- $ENV{'user.domain'},
- $ENV{'user.name'},$portfolio_root);
- if ($dir_list[0] 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
- if ($current_path eq '/'){
- &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio');
- } else {
- # some directory that snuck in get rid of the directory
- # from the recent pulldown, just in case
- &Apache::lonhtmlcommon::remove_recent('portfolio',
- [$current_path]);
- $current_path = '/'; # force it back to the root
+ Check as many as you wish in response to the problem. ");
+ my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+ if (@otherfiles) {
+ $r->print("Files selected from other directories: ");
+ foreach my $file (@otherfiles) {
+ $r->print($file." ");
}
- # now grab the directory list again, for the first time
- @dir_list=&Apache::lonnet::dirlist($current_path,
- $ENV{'user.domain'},
- $ENV{'user.name'},$portfolio_root);
}
- # need to know if directory is empty so it can be removed if desired
- my $is_empty=(@dir_list == 2);
- &display_file_select($r,$current_path,$is_empty,\@dir_list);
- $r->print("