# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-02-28
+# Last modified: 2005-06-14
#
use strict;
use vars qw(@EXPORT);
+use Fcntl;
use File::Access;
use File::Copy;
use File::Path;
+use Digest::MD5 qw(md5_hex);
use POSIX qw(strftime);
use Tool;
use CGI qw(header
escape);
-use HTML::Entities;
use Output;
use Template;
-my $script = encode_entities($ENV{'SCRIPT_NAME'});
+my $script = encode_html($ENV{'SCRIPT_NAME'});
my $users = eval('getpwuid(0)') && eval('getgrgid(0)');
-my %dispatch = ('show' => \&exec_show,
- 'beginedit' => \&exec_beginedit,
- 'canceledit' => \&exec_canceledit,
- 'endedit' => \&exec_endedit,
- 'mkdir' => \&exec_mkdir,
- 'mkfile' => \&exec_mkfile,
- 'upload' => \&exec_upload,
- 'copy' => \&exec_copy,
- 'rename' => \&exec_rename,
- 'remove' => \&exec_remove,
- 'chprop' => \&exec_chprop,
- 'unlock' => \&exec_unlock,
- 'about' => \&exec_about
+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
);
### Export ###
}
}
- return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => encode_entities($command)});
+ return error($config->{'errors'}->{'command_unknown'},'/',{COMMAND => encode_html($command)});
}
# exec_show()
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- my $upper_path = encode_entities(upper_path($virtual));
- my $uselist = $data->{'uselist'};
+ my $upper_path = multi_string(upper_path($virtual));
my $tpl = new Template;
{
# Create directory listing
- return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
+ return error($config->{'errors'}->{'no_dir_access'},$upper_path->{'normal'}) unless(-r $physical && -x $physical);
my $direntries = dir_read($physical);
- return error($config->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries);
+ return error($config->{'errors'}->{'dir_read_failed'},$upper_path->{'normal'},{DIR => encode_html($virtual)}) unless($direntries);
my $files = $direntries->{'files'};
my $dirs = $direntries->{'dirs'};
- my $dir_writeable = -w $physical;
-
my $dirlist = '';
my $filter1 = $data->{'cgi'}->param('filter') || '*'; # The real wildcard
my $udtpl = new Template;
$udtpl->read_file($config->{'templates'}->{'dirlist_up'});
- $udtpl->fillin('UPPER_DIR',$upper_path);
- $udtpl->fillin('DATE',encode_entities(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
+ $udtpl->fillin('UPPER_DIR',$upper_path->{'html'});
+ $udtpl->fillin('UPPER_DIR_URL',$upper_path->{'url'});
+ $udtpl->fillin('DATE',encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
$dirlist .= $udtpl->get_template;
}
next unless(dos_wildcard_match($filter1,$dir));
my $phys_path = $physical.'/'.$dir;
- my $virt_path = encode_entities($virtual.$dir.'/');
+ my $virt_path = multi_string($virtual.$dir.'/');
my @stat = stat($phys_path);
my $dtpl = new Template;
$dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
- $dtpl->fillin('DIR',$virt_path);
- $dtpl->fillin('DIR_NAME',encode_entities($dir));
- $dtpl->fillin('DATE',encode_entities(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
- $dtpl->fillin('URL',equal_url(encode_entities($config->{'httproot'}),$virt_path));
+ $dtpl->fillin('DIR',$virt_path->{'html'});
+ $dtpl->fillin('DIR_URL',$virt_path->{'url'});
+ $dtpl->fillin('DIR_NAME',encode_html($dir));
+ $dtpl->fillin('DATE',encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
+ $dtpl->fillin('URL',equal_url(encode_html($config->{'httproot'}),$virt_path->{'html'}));
+ $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);
next unless(dos_wildcard_match($filter1,$file));
my $phys_path = $physical.'/'.$file;
- my $virt_path = encode_entities($virtual.$file);
+ my $virt_path = multi_string($virtual.$file);
my @stat = lstat($phys_path);
- my $in_use = $uselist->in_use($virtual.$file);
my $too_large = $config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'};
my $ftpl = new Template;
$ftpl->read_file($config->{'templates'}->{'dirlist_file'});
- $ftpl->fillin('FILE',$virt_path);
- $ftpl->fillin('FILE_NAME',encode_entities($file));
+ $ftpl->fillin('FILE',$virt_path->{'html'});
+ $ftpl->fillin('FILE_URL',$virt_path->{'url'});
+ $ftpl->fillin('FILE_NAME',encode_html($file));
+ $ftpl->fillin('FILE_URL',$virt_path->{'url'});
$ftpl->fillin('SIZE',$stat[7]);
- $ftpl->fillin('DATE',encode_entities(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
- $ftpl->fillin('URL',equal_url(encode_entities($config->{'httproot'}),$virt_path));
+ $ftpl->fillin('DATE',encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));
+ $ftpl->fillin('URL',equal_url(encode_html($config->{'httproot'}),$virt_path->{'html'}));
$ftpl->parse_if_block('link',-l $phys_path);
- $ftpl->parse_if_block('no_link',not -l $phys_path);
- $ftpl->parse_if_block('not_readable',not -r $phys_path);
+ $ftpl->parse_if_block('readable',-r $phys_path);
+ $ftpl->parse_if_block('writeable',-w $phys_path);
$ftpl->parse_if_block('binary',-B $phys_path);
- $ftpl->parse_if_block('readonly',not -w $phys_path);
+ $ftpl->parse_if_block('forbidden',is_forbidden_file($config->{'forbidden'},$virt_path->{'normal'}));
$ftpl->parse_if_block('viewable',(-r $phys_path && -T $phys_path && not $too_large) || -l $phys_path);
- $ftpl->parse_if_block('editable',((-r $phys_path && -w $phys_path && -T $phys_path && not $too_large) && not $in_use) && not -l $phys_path);
-
- $ftpl->parse_if_block('in_use',$in_use);
- $ftpl->parse_if_block('unused',not $in_use);
+ $ftpl->parse_if_block('editable',(-r $phys_path && -w $phys_path && -T $phys_path && not $too_large) && not -l $phys_path);
$ftpl->parse_if_block('too_large',$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
$tpl->read_file($config->{'templates'}->{'dirlist'});
$tpl->fillin('DIRLIST',$dirlist);
- $tpl->fillin('DIR',encode_entities($virtual));
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('DIR_URL',escape($virtual));
$tpl->fillin('SCRIPT',$script);
- $tpl->fillin('URL',encode_entities(equal_url($config->{'httproot'},$virtual)));
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
- $tpl->fillin('FILTER',encode_entities($filter2));
+ $tpl->fillin('FILTER',encode_html($filter2));
$tpl->fillin('FILTER_URL',escape($filter2));
$tpl->parse_if_block('empty',$dirlist eq '');
- $tpl->parse_if_block('dir_writeable',$dir_writeable);
+ $tpl->parse_if_block('dir_writeable',-w $physical);
$tpl->parse_if_block('filter',$filter2);
$tpl->parse_if_block('gmt',$config->{'use_gmt'});
}
$tpl->read_file($config->{'templates'}->{'viewlink'});
- $tpl->fillin('FILE',encode_entities($virtual));
- $tpl->fillin('DIR',$upper_path);
- $tpl->fillin('URL',encode_entities(equal_url($config->{'httproot'},$virtual)));
+ $tpl->fillin('FILE',encode_html($virtual));
+ $tpl->fillin('DIR',$upper_path->{'html'});
+ $tpl->fillin('DIR_URL',$upper_path->{'url'});
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
- $tpl->fillin('LINK_TARGET',encode_entities($link_target));
+ $tpl->fillin('LINK_TARGET',encode_html($link_target));
}
else
{
# View a file
- return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);
+ return error($config->{'errors'}->{'no_view'},$upper_path->{'normal'}) unless(-r $physical);
# Check on binary files
# We have to do it in this way or empty files will be recognized
# as binary files
- return error($config->{'errors'}->{'binary'},$upper_path) unless(-T $physical);
+ return error($config->{'errors'}->{'binary_file'},$upper_path->{'normal'}) unless(-T $physical);
# Is the file too large?
- return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});
+ return error($config->{'errors'}->{'file_too_large'},$upper_path->{'normal'},{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});
# View the file
$tpl->read_file($config->{'templates'}->{'viewfile'});
- $tpl->fillin('FILE',encode_entities($virtual));
- $tpl->fillin('DIR',$upper_path);
- $tpl->fillin('URL',encode_entities(equal_url($config->{'httproot'},$virtual)));
+ $tpl->fillin('FILE',encode_html($virtual));
+ $tpl->fillin('FILE_URL',escape($virtual));
+ $tpl->fillin('DIR',$upper_path->{'html'});
+ $tpl->fillin('DIR_URL',$upper_path->{'url'});
+ $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
$tpl->fillin('SCRIPT',$script);
- $tpl->parse_if_block('editable',-w $physical && $uselist->unused($virtual));
+ $tpl->parse_if_block('editable',-w $physical);
- $tpl->fillin('CONTENT',encode_entities($$content));
+ $tpl->fillin('CONTENT',encode_html($$content));
}
my $output = header(-type => 'text/html');
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $dir = upper_path($virtual);
- my $uselist = $data->{'uselist'};
- return error($config->{'errors'}->{'link_edit'},$dir) if(-l $physical);
- return error($config->{'errors'}->{'dir_edit'}, $dir) if(-d $physical);
- return error($config->{'errors'}->{'in_use'}, $dir,{FILE => $virtual}) if($uselist->in_use($virtual));
- return error($config->{'errors'}->{'no_edit'}, $dir) unless(-r $physical && -w $physical);
+ return error($config->{'errors'}->{'link_edit'},$dir) if(-l $physical);
+ return error($config->{'errors'}->{'dir_edit'}, $dir) if(-d $physical);
+ return error($config->{'errors'}->{'no_edit'}, $dir) unless(-r $physical && -w $physical);
# Check on binary files
- return error($config->{'errors'}->{'binary'},$dir) unless(-T $physical);
+ return error($config->{'errors'}->{'binary_file'},$dir) unless(-T $physical);
# Is the file too large?
return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});
- # Lock the file...
-
- ($uselist->add_file($virtual) and
- $uselist->save) or return error($config->{'errors'}->{'ul_add_failed'},$dir,{FILE => $virtual});
-
- # ... and show the editing form
+ # Show the editing form
my $content = file_read($physical);
+ my $md5sum = md5_hex($$content);
$$content =~ s/\015\012|\012|\015/\n/g;
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'editfile'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
+ $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',equal_url($config->{'httproot'},$virtual));
$tpl->fillin('SCRIPT',$script);
- $tpl->fillin('CONTENT',encode_entities($$content));
+ $tpl->fillin('MD5SUM',$md5sum);
+ $tpl->fillin('CONTENT',encode_html($$content));
+
+ $tpl->parse_if_block('error',0);
my $output = header(-type => 'text/html');
$output .= $tpl->get_template;
return \$output;
}
-# exec_canceledit()
-#
-# Abort file editing
-#
-# Params: 1. Reference to user input hash
-# 2. Reference to config hash
-#
-# Return: Output of the command (Scalar Reference)
-
-sub exec_canceledit($$)
-{
- my ($data,$config) = @_;
- my $virtual = $data->{'virtual'};
- my $dir = upper_path($virtual);
- my $uselist = $data->{'uselist'};
-
- file_unlock($uselist,$virtual) or return error($config->{'errors'}->{'ul_rm_failed'},$dir,{FILE => $virtual, USELIST => $uselist->{'listfile'}});
- return devedit_reload({command => 'show', file => $dir});
-}
-
# exec_endedit()
#
# Save a file, unlock it and return to directory view
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $dir = upper_path($virtual);
- my $content = $data->{'cgi'}->param('filecontent');
- my $uselist = $data->{'uselist'};
+ my $cgi = $data->{'cgi'};
+ my $content = $cgi->param('filecontent');
+ my $md5sum = $cgi->param('md5sum');
+ my $output;
- # We already unlock the file at the beginning of the subroutine,
- # because if we have to abort this routine, the file keeps locked.
- # No other user of Dev-Editor will access the file during this
- # routine because of the concept of File::UseList.
+ if(defined $content && $md5sum)
+ {
+ # Normalize newlines
- file_unlock($uselist,$virtual) or return error($config->{'errors'}->{'ul_rm_failed'},$dir,{FILE => $virtual, USELIST => $uselist->{'listfile'}});
+ $content =~ s/\015\012|\012|\015/\n/g;
- # Normalize newlines
+ if($cgi->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')
+ {
+ # Create the new filename
- $content =~ s/\015\012|\012|\015/\n/g;
+ $physical = $data->{'new_physical'};
+ $virtual = $data->{'new_virtual'};
+ }
- if($data->{'cgi'}->param('encode_iso'))
- {
- # Encode all ISO-8859-1 special chars
+ return error($config->{'errors'}->{'link_edit'},$dir) if(-l $physical);
+ return error($config->{'errors'}->{'dir_edit'},$dir) if(-d $physical);
+ return error($config->{'errors'}->{'no_edit'},$dir) if(-e $physical && !(-r $physical && -w $physical));
+ return error($config->{'errors'}->{'text_to_binary'},$dir) if(-e $physical && not -T $physical);
- $content = encode_entities($content,"\200-\377");
- }
+ # For technical reasons, we can't use file_save() for
+ # saving the file...
- if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')
- {
- # Create the new filename
+ local *FILE;
- $physical = $data->{'new_physical'};
- $virtual = $data->{'new_virtual'};
+ 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}) };
- # Check if someone else is editing the new file
+ my $md5 = new Digest::MD5;
+ $md5->addfile(*FILE);
- return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($uselist->in_use($virtual));
- }
+ my $md5file = $md5->hexdigest;
+ my $md5data = md5_hex($content);
- return error($config->{'errors'}->{'link_edit'},$dir) if(-l $physical);
- return error($config->{'errors'}->{'dir_edit'},$dir) if(-d $physical);
- return error($config->{'errors'}->{'no_edit'},$dir) if(-e $physical && !(-r $physical && -w $physical));
- return error($config->{'errors'}->{'text_to_binary'},$dir) if(-e $physical && not -T $physical);
+ if($md5file ne $md5sum && $md5data ne $md5file && not $cgi->param('saveas'))
+ {
+ # The file changed meanwhile
- if(file_save($physical,\$content))
- {
- # The file was successfully saved!
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'editfile'});
- return devedit_reload({command => 'show', file => $dir});
- }
- else
- {
- return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual});
+ $tpl->fillin('ERROR',$config->{'errors'}->{'edit_file_changed'});
+
+ $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',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('SCRIPT',$script);
+ $tpl->fillin('MD5SUM',$md5file);
+ $tpl->fillin('CONTENT',encode_html($content));
+
+ $tpl->parse_if_block('error',1);
+
+ my $data = header(-type => 'text/html');
+ $data .= $tpl->get_template;
+
+ $output = \$data;
+ }
+ else
+ {
+ if($md5data ne $md5file)
+ {
+ seek(FILE,0,0);
+ truncate(FILE,0);
+
+ print FILE $content;
+ }
+
+ $output = devedit_reload({command => 'show', file => $dir});
+ }
+
+ close(FILE);
+
+ return $output;
}
+
+ return devedit_reload({command => 'beginedit', file => $virtual});
}
# exec_mkfile()
my $new_physical = $data->{'new_physical'};
my $new_virtual = $data->{'new_virtual'};
my $dir = upper_path($new_virtual);
- $new_virtual = encode_entities($new_virtual);
+ $new_virtual = encode_html($new_virtual);
if($new_physical)
{
my $new_physical = $data->{'new_physical'};
my $new_virtual = $data->{'new_virtual'};
my $dir = upper_path($new_virtual);
- $new_virtual = encode_entities($new_virtual);
+ $new_virtual = encode_html($new_virtual);
if($new_physical)
{
my $filename = file_name($uploaded_file);
my $file_phys = $physical.'/'.$filename;
- my $file_virt = $virtual.$filename;
-
- return error($config->{'errors'}->{'in_use'},$virtual,{FILE => $file_virt}) if($data->{'uselist'}->in_use($file_virt));
+ my $file_virt = encode_html($virtual.$filename);
if(-e $file_phys)
{
return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) unless($cgi->param('overwrite'));
}
- my $ascii = $cgi->param('ascii');
- my $handle = $cgi->upload('uploaded_file');
+ my $ascii = $cgi->param('ascii');
+ my $handle = $cgi->upload('uploaded_file');
return error($config->{'errors'}->{'invalid_upload'},$virtual) unless($handle);
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'upload'});
- $tpl->fillin('DIR',$virtual);
+ $tpl->fillin('DIR',encode_html($virtual));
+ $tpl->fillin('DIR_URL',escape($virtual));
$tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
$tpl->fillin('SCRIPT',$script);
{
my ($data,$config) = @_;
my $physical = $data->{'physical'};
- my $virtual = encode_entities($data->{'virtual'});
+ my $virtual = $data->{'virtual'};
my $dir = upper_path($virtual);
my $new_physical = $data->{'new_physical'};
if($new_physical)
{
- my $new_virtual = $data->{'new_virtual'};
- my $new_dir = upper_path($new_virtual);
- $new_virtual = encode_entities($new_virtual);
+ my $new_virtual = multi_string($data->{'new_virtual'});
+ my $new_dir = upper_path($new_virtual->{'normal'});
if(-e $new_physical)
{
- return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
- 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}) unless(-w $new_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);
if(not $data->{'cgi'}->param('confirmed'))
{
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('NEW_FILE',$new_virtual);
- $tpl->fillin('NEW_FILENAME',file_name($new_virtual));
- $tpl->fillin('NEW_DIR',$new_dir);
- $tpl->fillin('DIR',$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->fillin('COMMAND','copy');
$tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
}
}
- copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual});
+ 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'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $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);
my $output = header(-type => 'text/html');
my $dir = upper_path($virtual);
my $new_physical = $data->{'new_physical'};
- return error($config->{'errors'}->{'rename_root'},'/') if($virtual eq '/');
- return error($config->{'errors'}->{'no_rename'},$dir) unless(-w upper_path($physical));
- return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+ return error($config->{'errors'}->{'rename_root'},'/') if($virtual eq '/');
+ return error($config->{'errors'}->{'no_rename'},$dir) unless(-w upper_path($physical));
if($new_physical)
{
- my $new_virtual = $data->{'new_virtual'};
- my $new_dir = upper_path($new_virtual);
- $new_virtual = encode_entities($new_virtual);
+ my $new_virtual = multi_string($data->{'new_virtual'});
+ my $new_dir = upper_path($new_virtual->{'normal'});
if(-e $new_physical)
{
- return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical && not -l $new_physical);
return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical);
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_replace'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('NEW_FILE',$new_virtual);
- $tpl->fillin('NEW_FILENAME',file_name($new_virtual));
- $tpl->fillin('NEW_DIR',$new_dir);
- $tpl->fillin('DIR',$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('COMMAND','rename');
$tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
}
}
- rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual});
+ move($physical,$new_physical) or return error($config->{'errors'}->{'rename_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'}->{'renamefile'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
+ $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('SCRIPT',$script);
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
- $tpl->fillin('DIR',$virtual);
- $tpl->fillin('UPPER_DIR',$dir);
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $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',equal_url($config->{'httproot'},encode_html($virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
{
# Remove a file
- return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
-
if($data->{'cgi'}->param('confirmed'))
{
unlink($physical) or return error($config->{'errors'}->{'delete_failed'},$dir,{FILE => $virtual});
my $tpl = new Template;
$tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $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',equal_url($config->{'httproot'},encode_html($virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
my $virtual = $data->{'virtual'};
my $dir = upper_path($virtual);
- return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual}) unless($users);
- return error($config->{'errors'}->{'chprop_root'},'/') if($virtual eq '/');
- return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual}) unless(-o $physical);
- return error($config->{'errors'}->{'chprop_link'},$dir) if(-l $physical);
- return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+ return error($config->{'errors'}->{'no_users'},$dir,{FILE => encode_html($virtual)}) unless($users);
+ return error($config->{'errors'}->{'chprop_root'},'/') if($virtual eq '/');
+ return error($config->{'errors'}->{'not_owner'},$dir,{FILE => encode_html($virtual)}) unless(-o $physical);
+ return error($config->{'errors'}->{'chprop_link'},$dir) if(-l $physical);
my $cgi = $data->{'cgi'};
my $mode = $cgi->param('mode');
{
# Change the mode
+ return error($config->{'errors'}->{'invalid_mode'},$dir) unless($mode =~ /^[0-7]{3,}$/);
chmod(oct($mode),$physical);
}
{
# Change the group using the `chgrp` system command
- return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_entities($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
+ return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_html($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
system('chgrp',$group,$physical);
}
if(my $group = getgrgid($gid))
{
- $tpl->fillin('GROUP',encode_entities($group));
+ $tpl->fillin('GROUP',encode_html($group));
$tpl->parse_if_block('group_detected',1);
}
else
# Insert other information
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
- $tpl->fillin('SCRIPT',$script);
-
- my $output = header(-type => 'text/html');
- $output .= $tpl->get_template;
-
- return \$output;
- }
-}
-
-# exec_unlock()
-#
-# Remove a file from the list of used files 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_unlock($$)
-{
- my ($data,$config) = @_;
- my $virtual = $data->{'virtual'};
- my $uselist = $data->{'uselist'};
- my $dir = upper_path($virtual);
-
- return devedit_reload({command => 'show', file => $dir}) if($uselist->unused($virtual));
-
- if($data->{'cgi'}->param('confirmed'))
- {
- file_unlock($uselist,$virtual) or return error($config->{'errors'}->{'ul_rm_failed'},$dir,{FILE => $virtual, USELIST => $uselist->{'listfile'}});
- return devedit_reload({command => 'show', file => $dir});
- }
- else
- {
- my $tpl = new Template;
- $tpl->read_file($config->{'templates'}->{'confirm_unlock'});
-
- $tpl->fillin('FILE',$virtual);
- $tpl->fillin('DIR',$dir);
- $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $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',equal_url($config->{'httproot'},encode_html($virtual)));
$tpl->fillin('SCRIPT',$script);
my $output = header(-type => 'text/html');
# Some path information
- $tpl->fillin('SCRIPT_PHYS',encode_entities($ENV{'SCRIPT_FILENAME'}));
- $tpl->fillin('CONFIG_PATH',encode_entities($data->{'configfile'}));
- $tpl->fillin('FILE_ROOT', encode_entities($config->{'fileroot'}));
- $tpl->fillin('HTTP_ROOT', encode_entities($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->fillin('PERL_PROG',encode_entities($^X));
+ $tpl->fillin('PERL_PROG',encode_html($^X));
$tpl->fillin('PERL_VER', sprintf('%vd',$^V));
# Information about the server
- $tpl->fillin('HTTPD',encode_entities($ENV{'SERVER_SOFTWARE'}));
- $tpl->fillin('OS', encode_entities($^O));
- $tpl->fillin('TIME', encode_entities(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'});
if(my $user = getpwuid($uid))
{
- $tpl->fillin('USER',encode_entities($user));
+ $tpl->fillin('USER',encode_html($user));
$tpl->parse_if_block('user_detected',1);
}
else
if(my $group = getgrgid($gid))
{
- $tpl->fillin('GROUP',encode_entities($group));
+ $tpl->fillin('GROUP',encode_html($group));
$tpl->parse_if_block('group_detected',1);
}
else
git.p6c8.net / devedit.git / blobdiff