# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2009-05-10
+# Last modified: 2011-01-05
#
# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
-# Copyright (C) 2003-2009 Patrick Canterino
+# Copyright (C) 2003-2011 Patrick Canterino
# All Rights Reserved.
#
# This file can be distributed and/or modified under the terms of
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,
$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;
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
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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'mkfile'});
- $tpl->set_var('DIR','/');
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('DIR','/');
+ $tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$output .= $tpl->get_template;
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'mkdir'});
- $tpl->set_var('DIR','/');
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('DIR','/');
+ $tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
$output .= $tpl->get_template;
$data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode
file_save($file_phys,\$data,not $ascii) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
+ if($cgi->param('unpack') && $File::Access::has_archive_extract)
+ {
+ return error($config->{'errors'}->{'no_archive'},$virtual,{FILE => encode_html($file_virt)}) unless(is_archive($file_phys));
+
+ my $return_unpack = archive_unpack($file_phys,$physical);
+
+ return error($config->{'errors'}->{'unpack_failed'},$virtual,{FILE => encode_html($file_virt), AE_ERROR => ''}) unless($return_unpack);
+ }
+
return devedit_reload({command => 'show', file => $virtual});
}
else
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'upload'});
- $tpl->set_var('DIR',encode_html($virtual));
- $tpl->set_var('DIR_URL',escape($virtual));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('DIR_URL',escape($virtual));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+ $tpl->fillin('SCRIPT',$script);
+
+ $tpl->parse_if_block('PERL_ARCHIVE_EXTRACT',$File::Access::has_archive_extract);
+
+ my $output = header(-type => 'text/html');
+ $output .= $tpl->get_template;
+
+ return \$output;
+ }
+}
+
+# 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 => encode_html($File::Access::archive_extract_error)}) unless($return_unpack);
+
+ return devedit_reload({command => 'show', file => $new_virtual});
+ }
+ else
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'unpack'});
- $tpl->parse;
+ $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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('NEW_FILE',$new_virtual->{'html'});
- $tpl->set_var('NEW_FILENAME',file_name($new_virtual->{'html'}));
- $tpl->set_var('NEW_DIR',encode_html($new_dir));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
+ $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->set_var('COMMAND','copy');
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $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;
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'copydir'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'copyfile'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('NEW_FILE',$new_virtual->{'html'});
- $tpl->set_var('NEW_FILENAME',file_name($new_virtual->{'html'}));
- $tpl->set_var('NEW_DIR',encode_html($new_dir));
- $tpl->set_var('DIR',encode_html($dir));
+ $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->set_var('COMMAND','rename');
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('COMMAND','rename');
+ $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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'renamefile'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
- $tpl->set_var('DIR',encode_html($virtual));
- $tpl->set_var('DIR_URL',escape($virtual));
- $tpl->set_var('UPPER_DIR',encode_html($dir));
- $tpl->set_var('UPPER_DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('DIR_URL',escape($virtual));
+ $tpl->fillin('UPPER_DIR',encode_html($dir));
+ $tpl->fillin('UPPER_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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('FILE_URL',escape($virtual));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('FILE',encode_html($virtual));
+ $tpl->fillin('FILE_URL',escape($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 $virtual = $data->{'virtual'};
my $cgi = $data->{'cgi'};
- my @files = $cgi->param('files');
+ my @files = $cgi->param('files');#
my @new_files;
if(@files)
$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->add_loop_data('FAILED',{FILE => encode_html($file_failed),
FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))});
}
+
+ $tpl->parse_loop('FAILED');
}
else
{
}
- $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;
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;
# Insert file properties into the template
- $tpl->set_var('MODE_OCTAL',substr(sprintf('%04o',$mode),-4));
- $tpl->set_var('MODE_STRING',mode_string($mode));
- $tpl->set_var('GID',$gid);
+ $tpl->fillin('MODE_OCTAL',substr(sprintf('%04o',$mode),-4));
+ $tpl->fillin('MODE_STRING',mode_string($mode));
+ $tpl->fillin('GID',$gid);
if(my $group = getgrgid($gid))
{
- $tpl->set_var('GROUP',encode_html($group));
+ $tpl->fillin('GROUP',encode_html($group));
$tpl->parse_if_block('group_detected',1);
}
else
# Insert other information
- $tpl->set_var('FILE',encode_html($virtual));
- $tpl->set_var('FILE_URL',escape($virtual));
- $tpl->set_var('DIR',encode_html($dir));
- $tpl->set_var('DIR_URL',escape($dir));
- $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->set_var('SCRIPT',$script);
-
- $tpl->parse;
+ $tpl->fillin('FILE',encode_html($virtual));
+ $tpl->fillin('FILE_URL',escape($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 $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'about'});
- $tpl->set_var('SCRIPT',$script);
+ $tpl->fillin('SCRIPT',$script);
# Dev-Editor's version number
- $tpl->set_var('VERSION',$data->{'version'});
+ $tpl->fillin('VERSION',$data->{'version'});
# Some path information
- $tpl->set_var('SCRIPT_PHYS',encode_html($ENV{'SCRIPT_FILENAME'}));
- $tpl->set_var('CONFIG_PATH',encode_html($data->{'configfile'}));
- $tpl->set_var('FILE_ROOT', encode_html($config->{'fileroot'}));
- $tpl->set_var('HTTP_ROOT', encode_html($config->{'httproot'}));
+ $tpl->fillin('SCRIPT_PHYS',encode_html($ENV{'SCRIPT_FILENAME'}));
+ $tpl->fillin('CONFIG_PATH',encode_html($data->{'configfile'}));
+ $tpl->fillin('FILE_ROOT', encode_html($config->{'fileroot'}));
+ $tpl->fillin('HTTP_ROOT', encode_html($config->{'httproot'}));
# Perl
- $tpl->set_var('PERL_PROG',encode_html($^X));
- $tpl->set_var('PERL_VER', sprintf('%vd',$^V));
+ $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
- $tpl->set_var('HTTPD',encode_html($ENV{'SERVER_SOFTWARE'}));
- $tpl->set_var('OS', encode_html($^O));
- $tpl->set_var('TIME', encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime : localtime)));
+ $tpl->fillin('HTTPD',encode_html($ENV{'SERVER_SOFTWARE'}));
+ $tpl->fillin('OS', encode_html($^O));
+ $tpl->fillin('TIME', encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime : localtime)));
$tpl->parse_if_block('gmt',$config->{'use_gmt'});
# Process information
- $tpl->set_var('PID',$$);
+ $tpl->fillin('PID',$$);
# The following information is only available on systems supporting
# users and groups
# IDs of user and group
- $tpl->set_var('UID',$uid);
- $tpl->set_var('GID',$gid);
+ $tpl->fillin('UID',$uid);
+ $tpl->fillin('GID',$gid);
# Names of user and group
if(my $user = getpwuid($uid))
{
- $tpl->set_var('USER',encode_html($user));
+ $tpl->fillin('USER',encode_html($user));
$tpl->parse_if_block('user_detected',1);
}
else
if(my $group = getgrgid($gid))
{
- $tpl->set_var('GROUP',encode_html($group));
+ $tpl->fillin('GROUP',encode_html($group));
$tpl->parse_if_block('group_detected',1);
}
else
# Process umask
- $tpl->set_var('UMASK',sprintf('%04o',umask));
+ $tpl->fillin('UMASK',sprintf('%04o',umask));
}
else
{
$tpl->parse_if_block('users',0);
}
- $tpl->parse;
-
my $output = header(-type => 'text/html');
$output .= $tpl->get_template;
git.p6c8.net / devedit.git / blobdiff