X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/f447a0e284b8697ea0530b8c4446c127320245a0..df1e8791c8d9aa7c56f686490ac18a4fd1a43aa5:/modules/Command.pm?ds=inline diff --git a/modules/Command.pm b/modules/Command.pm index c4e7f12..ec7ca69 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: 2009-05-04 +# Last modified: 2010-10-30 # # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann # Copyright (C) 2003-2009 Patrick Canterino @@ -42,9 +42,11 @@ 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, + 'unpack' => \&exec_unpack, 'copy' => \&exec_copy, 'rename' => \&exec_rename, 'remove' => \&exec_remove, @@ -211,6 +213,8 @@ sub exec_show($$) $ftpl->parse_if_block('users',$users && -o $phys_path); + $ftpl->parse_if_block('archive',$File::Access::has_archive_extract && is_archive($file)); + $ftpl->parse_if_block('even',($count % 2) == 0); $dirlist .= $ftpl->get_template; @@ -444,6 +448,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((not -r $physical) || (-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 +496,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 { @@ -595,6 +633,56 @@ sub exec_upload($$) } } +# exec_unpack() +# +# Unpack an archive +# +# Params: 1. Reference to user input hash +# 2. Reference to config hash +# +# Return: Output of the command (Scalar Reference) + +sub exec_unpack($$) +{ + my ($data,$config) = @_; + my $physical = $data->{'physical'}; + my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); + my $new_physical = $data->{'new_physical'}; + my $new_virtual = $data->{'new_virtual'}; + my $cgi = $data->{'cgi'}; + + return error($config->{'errors'}->{'no_ae'},$dir) unless($File::Access::has_archive_extract); + return error($config->{'errors'}->{'no_archive'},$dir,{FILE => encode_html($virtual)}) unless(is_archive($physical)); + + if($new_physical) + { + return error($config->{'errors'}->{'unpack_no_dir'},$dir,{FILE => encode_html($virtual), NEW_FILE => encode_html($new_virtual)}) if(-l $new_physical || not -d $new_physical); + + my $return_unpack = archive_unpack($physical,$new_physical); + + return error($config->{'errors'}->{'unpack_failed'},$dir,{FILE => encode_html($virtual), AE_ERROR => ''}) unless($return_unpack); + + return devedit_reload({command => 'show', file => $new_virtual}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'unpack'}); + + $tpl->fillin('FILE',encode_html($virtual)); + $tpl->fillin('DIR',encode_html($dir)); + $tpl->fillin('DIR_URL',escape($dir)); + $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual))); + $tpl->fillin('SCRIPT',$script); + + my $output = header(-type => 'text/html'); + $output .= $tpl->get_template; + + return \$output; + } +} + # exec_copy() # # Copy a file and return to directory view @@ -935,12 +1023,21 @@ sub exec_remove_multi($$) if(scalar(@success) > 0) { - $tpl->parse_if_block('success',1); - - foreach my $file_success(@success) + if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0) { - $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success), - FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))}); + return devedit_reload({command => 'show', file => $virtual}); + } + else + { + $tpl->parse_if_block('success',1); + + foreach my $file_success(@success) + { + $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success), + FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))}); + } + + $tpl->parse_loop('SUCCESS'); } } else @@ -957,6 +1054,8 @@ sub exec_remove_multi($$) $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed), FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))}); } + + $tpl->parse_loop('FAILED'); } else { @@ -964,10 +1063,8 @@ sub exec_remove_multi($$) } - $tpl->set_var('DIR',encode_html($virtual)); - $tpl->set_var('SCRIPT',$script); - - $tpl->parse; + $tpl->fillin('DIR',encode_html($virtual)); + $tpl->fillin('SCRIPT',$script); my $output = header(-type => 'text/html'); $output .= $tpl->get_template; @@ -985,12 +1082,12 @@ sub exec_remove_multi($$) FILE_PATH => encode_html(clean_path($virtual.'/'.$file))}); } - $tpl->set_var('COUNT',scalar(@new_files)); + $tpl->parse_loop('FILES'); - $tpl->set_var('DIR',encode_html($virtual)); - $tpl->set_var('SCRIPT',$script); + $tpl->fillin('COUNT',scalar(@new_files)); - $tpl->parse; + $tpl->fillin('DIR',encode_html($virtual)); + $tpl->fillin('SCRIPT',$script); my $output = header(-type => 'text/html'); $output .= $tpl->get_template; @@ -1125,6 +1222,8 @@ sub exec_about($$) $tpl->fillin('PERL_PROG',encode_html($^X)); $tpl->fillin('PERL_VER', sprintf('%vd',$^V)); + + $tpl->parse_if_block('PERL_ARCHIVE_EXTRACT',$File::Access::has_archive_extract); # Information about the server