# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-06-14
+# Last modified: 2010-05-24
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2009 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 1.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).
#
use strict;
my $script = encode_html($ENV{'SCRIPT_NAME'});
my $users = eval('getpwuid(0)') && eval('getgrgid(0)');
-my %dispatch = ('show' => \&exec_show,
- 'beginedit' => \&exec_beginedit,
- 'endedit' => \&exec_endedit,
- 'mkdir' => \&exec_mkdir,
- 'mkfile' => \&exec_mkfile,
- 'upload' => \&exec_upload,
- 'copy' => \&exec_copy,
- 'rename' => \&exec_rename,
- 'remove' => \&exec_remove,
- 'chprop' => \&exec_chprop,
- 'about' => \&exec_about
+my %dispatch = ('show' => \&exec_show,
+ 'beginedit' => \&exec_beginedit,
+ 'endedit' => \&exec_endedit,
+ 'download' => \&exec_download,
+ 'mkdir' => \&exec_mkdir,
+ 'mkfile' => \&exec_mkfile,
+ 'upload' => \&exec_upload,
+ 'copy' => \&exec_copy,
+ 'rename' => \&exec_rename,
+ 'remove' => \&exec_remove,
+ 'remove_multi' => \&exec_remove_multi,
+ 'chprop' => \&exec_chprop,
+ 'about' => \&exec_about
);
### Export ###
my $dirlist = '';
+ my $count = 0;
+
my $filter1 = $data->{'cgi'}->param('filter') || '*'; # The real wildcard
my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output
unless($virtual eq '/')
{
+ $count++;
+
my @stat = stat($physical.'/..');
my $udtpl = new Template;
foreach my $dir(@$dirs)
{
+ next if($config->{'hide_dot_files'} && substr($dir,0,1) eq '.');
next unless(dos_wildcard_match($filter1,$dir));
+ $count++;
+
my $phys_path = $physical.'/'.$dir;
my $virt_path = multi_string($virtual.$dir.'/');
$dtpl->parse_if_block('forbidden',is_forbidden_file($config->{'forbidden'},$virt_path->{'normal'}));
$dtpl->parse_if_block('readable',-r $phys_path && -x $phys_path);
$dtpl->parse_if_block('users',$users && -o $phys_path);
+ $dtpl->parse_if_block('even',($count % 2) == 0);
$dirlist .= $dtpl->get_template;
}
foreach my $file(@$files)
{
+ next if($config->{'hide_dot_files'} && substr($file,0,1) eq '.');
next unless(dos_wildcard_match($filter1,$file));
+ $count++;
+
my $phys_path = $physical.'/'.$file;
my $virt_path = multi_string($virtual.$file);
$ftpl->parse_if_block('users',$users && -o $phys_path);
+ $ftpl->parse_if_block('even',($count % 2) == 0);
+
$dirlist .= $ftpl->get_template;
}
$tpl->fillin('FILE_URL',escape($virtual));
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
$tpl->fillin('MD5SUM',$md5sum);
$tpl->fillin('CONTENT',encode_html($$content));
local *FILE;
- sysopen(FILE,$physical,O_RDWR | O_CREAT) or return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual});
- file_lock(*FILE,LOCK_EX) or do { close(FILE); return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual}) };
+ sysopen(FILE,$physical,O_RDWR | O_CREAT) or return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => encode_html($virtual)});
+ file_lock(*FILE,LOCK_EX) or do { close(FILE); return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => encode_html($virtual)}) };
my $md5 = new Digest::MD5;
$md5->addfile(*FILE);
$tpl->fillin('FILE_URL',escape($virtual));
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
$tpl->fillin('MD5SUM',$md5file);
$tpl->fillin('CONTENT',encode_html($content));
print FILE $content;
}
- $output = devedit_reload({command => 'show', file => $dir});
+ $output = ($cgi->param('continue'))
+ ? devedit_reload({command => 'beginedit', file => $virtual})
+ : devedit_reload({command => 'show', file => $dir});
}
close(FILE);
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
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
{
my $virtual = $data->{'virtual'};
my $cgi = $data->{'cgi'};
- return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical && not -l $physical);
- return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => $virtual}) unless(-w $physical);
+ return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => encode_html($virtual)}) unless(-d $physical && not -l $physical);
+ return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => encode_html($virtual)}) unless(-w $physical);
if(my $uploaded_file = $cgi->param('uploaded_file'))
{
+ if($cgi->param('remote_file'))
+ {
+ $uploaded_file = $cgi->param('remote_file');
+
+ $uploaded_file =~ s!/!!g;
+ $uploaded_file =~ s!\\!!g;
+ }
+
# Process file upload
my $filename = file_name($uploaded_file);
$tpl->fillin('DIR',encode_html($virtual));
$tpl->fillin('DIR_URL',escape($virtual));
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
my $new_physical = $data->{'new_physical'};
return error($config->{'errors'}->{'link_copy'},$dir) if(-l $physical);
- return error($config->{'errors'}->{'dir_copy'},$dir) if(-d $physical);
return error($config->{'errors'}->{'no_copy'},$dir) unless(-r $physical);
if($new_physical)
my $new_virtual = multi_string($data->{'new_virtual'});
my $new_dir = upper_path($new_virtual->{'normal'});
- if(-e $new_physical)
+ if(-d $physical)
{
- return error($config->{'errors'}->{'link_replace'},$new_dir) if(-l $new_physical);
- return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical);
- return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual->{'html'}}) unless(-w $new_physical);
+ return error($config->{'errors'}->{'no_copy'},$dir) unless(-x $physical);
+ return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual->{'html'}}) if(-e $new_physical);
+ return error($config->{'errors'}->{'dir_copy_self'},$dir) if(index($new_virtual->{'normal'},$virtual) == 0);
- if(not $data->{'cgi'}->param('confirmed'))
+ dir_copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+ return devedit_reload({command => 'show', file => $new_dir});
+ }
+ else
+ {
+ if(-e $new_physical)
{
- my $tpl = new Template;
- $tpl->read_file($config->{'templates'}->{'confirm_replace'});
-
- $tpl->fillin('FILE',encode_html($virtual));
- $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
- $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
- $tpl->fillin('NEW_DIR',encode_html($new_dir));
- $tpl->fillin('DIR',encode_html($dir));
- $tpl->fillin('DIR_URL',escape($dir));
-
- $tpl->fillin('COMMAND','copy');
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
- $tpl->fillin('SCRIPT',$script);
-
- my $output = header(-type => 'text/html');
- $output .= $tpl->get_template;
-
- return \$output;
+ return error($config->{'errors'}->{'link_replace'},$new_dir) if(-l $new_physical);
+ return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical);
+ return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual->{'html'}}) unless(-w $new_physical);
+
+ if(not $data->{'cgi'}->param('confirmed'))
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+ $tpl->fillin('FILE',encode_html($virtual));
+ $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+ $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+ $tpl->fillin('NEW_DIR',encode_html($new_dir));
+ $tpl->fillin('DIR',encode_html($dir));
+ $tpl->fillin('DIR_URL',escape($dir));
+
+ $tpl->fillin('COMMAND','copy');
+ $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;
+ }
}
- }
- copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
- return devedit_reload({command => 'show', file => $new_dir});
+ copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+ return devedit_reload({command => 'show', file => $new_dir});
+ }
}
else
{
- my $tpl = new Template;
- $tpl->read_file($config->{'templates'}->{'copyfile'});
+ if(-d $physical)
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'copydir'});
- $tpl->fillin('FILE',encode_html($virtual));
- $tpl->fillin('DIR',encode_html($dir));
- $tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},encode_html($virtual)));
- $tpl->fillin('SCRIPT',$script);
+ $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;
+ my $output = header(-type => 'text/html');
+ $output .= $tpl->get_template;
- return \$output;
+ return \$output;
+ }
+ else
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'copyfile'});
+
+ $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;
+ }
}
}
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('COMMAND','rename');
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$tpl->fillin('FILE',encode_html($virtual));
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$tpl->fillin('DIR_URL',escape($virtual));
$tpl->fillin('UPPER_DIR',encode_html($dir));
$tpl->fillin('UPPER_DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},encode_html($virtual)));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$tpl->fillin('FILE_URL',escape($virtual));
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},encode_html($virtual)));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
}
}
+# exec_remove_multi()
+#
+# Remove a file or a directory and return to directory view
+#
+# Params: 1. Reference to user input hash
+# 2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_remove_multi($$)
+{
+ my ($data,$config) = @_;
+ my $physical = $data->{'physical'};
+ my $virtual = $data->{'virtual'};
+ my $cgi = $data->{'cgi'};
+
+ my @files = $cgi->param('files');#
+ my @new_files;
+
+ if(@files)
+ {
+ foreach my $file(@files)
+ {
+ # Filter out some "bad" files (e.g. files going up in the
+ # directory hierarchy or files containing slashes (it's too
+ # dangerous...)
+
+ next if($file =~ m!^\.+$!);
+ next if($file =~ m!/!);
+ next if($file =~ m!\\!);
+
+ push(@new_files,$file);
+ }
+ }
+
+ if(@new_files)
+ {
+ if($cgi->param('confirmed'))
+ {
+ my @success;
+ my @failed;
+
+ foreach my $file(@new_files)
+ {
+ my $file_path = clean_path($physical.'/'.$file);
+
+ if(-e $file_path)
+ {
+ if(-d $file_path && not -l $file_path)
+ {
+ # Remove a directory
+
+ if(rmtree($file_path))
+ {
+ push(@success,clean_path($file));
+ }
+ else
+ {
+ push(@failed,clean_path($file));
+ }
+ }
+ else
+ {
+ # Remove a file
+
+ if(unlink($file_path))
+ {
+ push(@success,clean_path($file));
+ }
+ else
+ {
+ push(@failed,clean_path($file));
+ }
+ }
+ }
+ else
+ {
+ push(@failed,clean_path($file));
+ }
+ }
+
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'rmmulti'});
+
+ if(scalar(@success) > 0)
+ {
+ if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0)
+ {
+ 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
+ {
+ $tpl->parse_if_block('success',0);
+ }
+
+ 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
+ {
+ $tpl->parse_if_block('failed',0);
+ }
+
+
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('SCRIPT',$script);
+
+ my $output = header(-type => 'text/html');
+ $output .= $tpl->get_template;
+
+ return \$output;
+ }
+ else
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'confirm_rmmulti'});
+
+ foreach my $file(@new_files)
+ {
+ $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));
+
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('SCRIPT',$script);
+
+ my $output = header(-type => 'text/html');
+ $output .= $tpl->get_template;
+
+ return \$output;
+ }
+ }
+ else
+ {
+ return devedit_reload({command => 'show', file => $virtual});
+ }
+}
+
# exec_chprop()
#
# Change the mode and the group of a file or a directory
$tpl->fillin('FILE_URL',escape($virtual));
$tpl->fillin('DIR',encode_html($dir));
$tpl->fillin('DIR_URL',escape($dir));
- $tpl->fillin('URL',equal_url($config->{'httproot'},encode_html($virtual)));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$tpl->parse_if_block('users',1);
- # ID's of user and group
+ # IDs of user and group
$tpl->fillin('UID',$uid);
$tpl->fillin('GID',$gid);
git.p6c8.net / devedit.git / blobdiff