X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/d63f55f3d737aa05e3a1496168c7b4979cbed782..4f312081a2b65ffd71c66e425cbe1b51e0e9c9ec:/modules/Command.pm?ds=inline diff --git a/modules/Command.pm b/modules/Command.pm index c1b8989..431eb4d 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2005-05-11 +# Last modified: 2010-05-24 # # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann # Copyright (C) 2003-2009 Patrick Canterino @@ -42,6 +42,7 @@ my $users = eval('getpwuid(0)') && eval('getgrgid(0)'); my %dispatch = ('show' => \&exec_show, 'beginedit' => \&exec_beginedit, 'endedit' => \&exec_endedit, + 'download' => \&exec_download, 'mkdir' => \&exec_mkdir, 'mkfile' => \&exec_mkfile, 'upload' => \&exec_upload, @@ -444,6 +445,32 @@ sub exec_endedit($$) return devedit_reload({command => 'beginedit', file => $virtual}); } +# exec_download() +# +# Execute a HTTP download of a file +# +# Params: 1. Reference to user input hash +# 2. Reference to config hash +# +# Return: Output of the command (Scalar Reference) + +sub exec_download($$) +{ + my ($data,$config) = @_; + my $physical = $data->{'physical'}; + my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); + + return return error($config->{'errors'}->{'no_download'},$dir,{FILE => $virtual}) if(-d $physical || -l $physical); + + my $filename = file_name($virtual); + + my $output = header(-type => 'application/octet-stream', -attachment => $filename); + $output .= ${ file_read($physical,1) }; + + return \$output; +} + # exec_mkfile() # # Create a file and return to directory view @@ -466,7 +493,15 @@ sub exec_mkfile($$) return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual}); - return devedit_reload({command => 'show', file => $dir}); + + if($data->{'cgi'}->param('edit')) + { + return devedit_reload({command => 'beginedit', file => $new_virtual}); + } + else + { + return devedit_reload({command => 'show', file => $dir}); + } } else { @@ -948,7 +983,7 @@ sub exec_remove_multi($$) $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success), FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))}); } - + $tpl->parse_loop('SUCCESS'); } } @@ -960,13 +995,13 @@ sub exec_remove_multi($$) if(scalar(@failed) > 0) { $tpl->parse_if_block('failed',1); - + foreach my $file_failed(@failed) { $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed), FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))}); } - + $tpl->parse_loop('FAILED'); } else @@ -993,7 +1028,7 @@ sub exec_remove_multi($$) $tpl->add_loop_data('FILES',{FILE => encode_html($file), FILE_PATH => encode_html(clean_path($virtual.'/'.$file))}); } - + $tpl->parse_loop('FILES'); $tpl->fillin('COUNT',scalar(@new_files));