--- loncom/interface/portfolio.pm 2004/08/24 07:26:04 1.27
+++ loncom/interface/portfolio.pm 2004/08/25 18:48:26 1.33
@@ -161,7 +161,7 @@ sub displayActions {
my $dirptr=16384;
sub display_directory {
- my ($r,$current_path,$dir_list)=@_;
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
$r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
$r->print('<td bgcolor="#ccddaa" align="center">');
@@ -180,7 +180,7 @@ sub display_directory {
$r->print($displayOut);
$r->print('</td></tr></table>');
my @tree = split (/\//,$current_path);
- $r->print('<font size="+2">'.&make_anchor('/','/'));
+ $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
@@ -194,6 +194,17 @@ sub display_directory {
&Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
'this.form.submit();'));
$r->print("</form>");
+ if ($is_empty) {
+ $displayOut = '<form method="post" action="/adm/portfolio">'.
+ '<input type="hidden" name="action" value="deletedir" />'.
+ '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '</form>';
+
+ $r->print($displayOut);
+ return;
+ }
$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
'<tr><th>Actions</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/";
@@ -255,6 +266,19 @@ sub open_form {
$ENV{'form.currentpath'}.'" />');
}
+sub clean_filename {
+ my ($fname)=@_;
+# Replace Windows backslashes by forward slashes
+ $fname=~s/\\/\//g;
+# Get rid of everything but the actual filename
+ $fname=~s/^.*\/([^\/]+)$/$1/;
+# Replace spaces by underscores
+ $fname=~s/\s+/\_/g;
+# Replace all other weird characters by nothing
+ $fname=~s/[^\w\.\-]//g;
+ return $fname;
+}
+
sub close_form {
my ($r)=@_;
$r->print('<p><input type="submit" value="'.&mt('Continue').
@@ -294,12 +318,44 @@ sub delete_confirmed {
$ENV{'form.currentpath'}.
$ENV{'form.selectfile'});
if ($result ne 'ok') {
- $r->print('<font color="red"> An errror occured ('.$result.
+ $r->print('<font color="red"> An error occured ('.$result.
') while trying to delete '.&display_file().'</font><br />');
}
$r->print(&done());
}
+sub delete_dir {
+ my ($r)=@_;
+ &open_form($r);
+ $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ &close_form($r);
+}
+
+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'.
+ $directory_name);
+
+ if ($result ne 'ok') {
+ $r->print('<font color="red"> An error occured (dir) ('.$result.
+ ') while trying to delete '.$directory_name.'</font><br />');
+ } else {
+ my @dirs = split m!/!, $directory_name;
+
+# $directory_name =~ m/^(\/*\/)(\/*.)$/;
+ $directory_name='/';
+ for (my $i=1; $i < (@dirs - 1); $i ++){
+ $directory_name .= $dirs[$i].'/';
+ }
+ $ENV{'form.currentpath'} = $directory_name;
+ }
+ $r->print(&done());
+}
+
sub rename {
my ($r)=@_;
&open_form($r);
@@ -334,21 +390,50 @@ sub upload {
my ($r)=@_;
#FIXME if the file already exists we need to do a confirmation pass
#before overwriting
- my $result=&Apache::lonnet::userfileupload('uploaddoc','',
- 'portfolio'.$ENV{'form.currentpath'});
- if ($result !~ m|^/uploaded/|) {
- $r->print('<font color="red"> An errror occured ('.$result.
- ') while trying to upload '.&display_file().'</font><br />');
+ my $fname=$ENV{'form.uploaddoc.filename'};
+ $fname=&clean_filename($fname);
+ my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+ $ENV{'user.name'}).
+ '/userfiles/portfolio';
+ my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
+ $ENV{'user.domain'},
+ $ENV{'user.name'},$portfolio_root);
+ my $found_file = 0;
+ foreach my $line (@dir_list) {
+ #$strip holds directory/file name
+ #$dom
+ my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+ if ($filename eq $fname){
+ $found_file = 1;
+ }
+ }
+ if ($found_file){
+ $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
+ '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
+ } else {
+ my $result=&Apache::lonnet::userfileupload('uploaddoc','',
+ 'portfolio'.$ENV{'form.currentpath'});
+ if ($result !~ m|^/uploaded/|) {
+ $r->print('<font color="red"> An errror occured ('.$result.
+ ') while trying to upload '.&display_file().'</font><br />');
+ }
}
$r->print(&done());
}
sub createdir {
my ($r)=@_;
- #FIXME 1) bad dirnames ( '/' etc)
- # 2) file exists in place of dir (errormessage needs improvement)
+ #FIXME 1) file exists in place of dir (errormessage needs improvement)
+ my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
+ if ($newdir eq '') {
+ $r->print('<font color="red">'.
+ &mt("Error: no valid directory name was provided.").
+ '</font><br />');
+ $r->print(&done());
+ return;
+ }
my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.newdir'});
+ $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
if ($result ne 'ok') {
$r->print('<font color="red"> An errror occured ('.$result.
') while trying to create a new directory '.&display_file().'</font><br />');
@@ -359,6 +444,9 @@ sub createdir {
sub handler {
# this handles file management
my $r = shift;
+ my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+ $ENV{'user.name'}).
+ '/userfiles/portfolio';
&Apache::loncommon::no_cache($r);
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -378,6 +466,10 @@ sub handler {
&delete_confirmed($r);
} elsif ($ENV{'form.action'} eq 'delete') {
&delete($r);
+ } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
+ &delete_dir_confirmed($r);
+ } elsif ($ENV{'form.action'} eq 'deletedir'){
+ &delete_dir($r);
} elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
&rename_confirmed($r);
} elsif ($ENV{'form.action'} eq 'rename') {
@@ -389,25 +481,16 @@ sub handler {
if ($ENV{'form.currentpath'}) {
$current_path = $ENV{'form.currentpath'};
}
-
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
- $ENV{'user.name'}).
- '/userfiles/portfolio';
my @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_directory($r,$current_path,\@dir_list);
-
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
+ $r->print("</body>\n</html>\n");
+ return OK;
}
-
- $r->print("</body>\n</html>\n");
- $r->rflush();
- return OK;
}
-
1;
__END__