# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-01-24
+# Last modified: 2005-04-10
#
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 Output;
use Template;
+use Data::Dumper;
+
my $script = encode_entities($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,
'rename' => \&exec_rename,
'remove' => \&exec_remove,
'chprop' => \&exec_chprop,
- 'unlock' => \&exec_unlock,
'about' => \&exec_about
);
}
}
- return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => encode_entities($command)});
+ return error($config->{'errors'}->{'command_unknown'},'/',{COMMAND => encode_entities($command)});
}
# exec_show()
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $upper_path = encode_entities(upper_path($virtual));
- my $uselist = $data->{'uselist'};
my $tpl = new Template;
- if(-d $physical)
+ if(-d $physical && not -l $physical)
{
# Create directory listing
my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output
# Create the link to the upper directory
- # (only if we are not in the root directory)
+ # (only if the current directory is not the root directory)
unless($virtual eq '/')
{
my $phys_path = $physical.'/'.$file;
my $virt_path = encode_entities($virtual.$file);
- my @stat = stat($phys_path);
- my $in_use = $uselist->in_use($virtual.$file);
+ my @stat = lstat($phys_path);
my $too_large = $config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'};
my $ftpl = new Template;
$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->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('binary',-B $phys_path);
$ftpl->parse_if_block('readonly',not -w $phys_path);
- $ftpl->parse_if_block('viewable',-r $phys_path && -T $phys_path && not $too_large);
- $ftpl->parse_if_block('editable',(-r $phys_path && -w $phys_path && -T $phys_path && not $too_large) && not $in_use);
-
- $ftpl->parse_if_block('in_use',$in_use);
- $ftpl->parse_if_block('unused',not $in_use);
+ $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 -l $phys_path);
$ftpl->parse_if_block('too_large',$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
$tpl->fillin('FILTER',encode_entities($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('filter',$filter2);
$tpl->parse_if_block('gmt',$config->{'use_gmt'});
}
+ elsif(-l $physical)
+ {
+ # Show the target of a symbolic link
+
+ my $link_target = readlink($physical);
+
+ $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('SCRIPT',$script);
+
+ $tpl->fillin('LINK_TARGET',encode_entities($link_target));
+ }
else
{
# View a file
# 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) unless(-T $physical);
# Is the file too large?
$tpl->fillin('URL',encode_entities(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));
}
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $dir = upper_path($virtual);
- my $uselist = $data->{'uselist'};
+ my $cgi = $data->{'cgi'};
- return error($config->{'errors'}->{'editdir'},$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);
- $uselist->save;
-
# ... and show the editing form
- my $content = file_read($physical);
+ my $content = file_read($physical,1);
+ my $md5sum = md5_hex($$content);
$$content =~ s/\015\012|\012|\015/\n/g;
my $tpl = new Template;
$tpl->fillin('DIR',$dir);
$tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
$tpl->fillin('SCRIPT',$script);
+ $tpl->fillin('MD5SUM',$md5sum);
$tpl->fillin('CONTENT',encode_entities($$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'};
-
- file_unlock($data->{'uselist'},$virtual);
- return devedit_reload({command => 'show', file => upper_path($virtual)});
-}
-
# 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);
+ $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}) };
+ binmode(FILE);
- # 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 $md5_new = $md5->hexdigest;
- return error($config->{'errors'}->{'editdir'},$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) unless(-T $physical);
+ if($md5_new ne $md5sum && not $cgi->param('saveas'))
+ {
+ # The file changed meanwhile
- if(file_save($physical,\$content))
- {
- # Saving of the file was successful!
+ 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',$virtual);
+ $tpl->fillin('DIR',$dir);
+ $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin('SCRIPT',$script);
+ $tpl->fillin('MD5SUM',$md5_new);
+ $tpl->fillin('CONTENT',encode_entities($content));
+
+ $tpl->parse_if_block('error',1);
+
+ my $data = header(-type => 'text/html');
+ $data .= $tpl->get_template;
+
+ $output = \$data;
+ }
+ else
+ {
+ # The file was saved successfully!
+
+ seek(FILE,0,0);
+ truncate(FILE,0);
+
+ print FILE $content;
+
+ $output = devedit_reload({command => 'show', file => $dir});
+
+ #return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual});
+ }
+
+ close(FILE);
+
+ return $output;
}
+
+ return devedit_reload({command => 'beginedit', file => $virtual});
}
# exec_mkfile()
# exec_upload()
#
-# Upload a file
+# Process a file upload
#
# Params: 1. Reference to user input hash
# 2. Reference to config hash
my $virtual = $data->{'virtual'};
my $cgi = $data->{'cgi'};
- return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical);
+ 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);
if(my $uploaded_file = $cgi->param('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));
-
if(-e $file_phys)
{
+ return error($config->{'errors'}->{'link_replace'},$virtual) if(-l $file_phys);
return error($config->{'errors'}->{'dir_replace'},$virtual) if(-d $file_phys);
return error($config->{'errors'}->{'exist_no_write'},$virtual,{FILE => $file_virt}) unless(-w $file_phys);
return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) unless($cgi->param('overwrite'));
my $dir = upper_path($virtual);
my $new_physical = $data->{'new_physical'};
- return error($config->{'errors'}->{'dircopy'},$dir) if(-d $physical);
- return error($config->{'errors'}->{'no_copy'},$dir) unless(-r $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)
{
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'}->{'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));
if($new_physical)
{
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);
+ 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);
if(not $data->{'cgi'}->param('confirmed'))
}
}
- 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 => $virtual, NEW_FILE => $new_virtual});
return devedit_reload({command => 'show', file => $new_dir});
}
else
return error($config->{'errors'}->{'remove_root'},'/') if($virtual eq '/');
return error($config->{'errors'}->{'no_delete'},$dir) unless(-w upper_path($physical));
- if(-d $physical)
+ if(-d $physical && not -l $physical)
{
# Remove a directory
{
# 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});
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'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+ return error($config->{'errors'}->{'chprop_link'},$dir) if(-l $physical);
my $cgi = $data->{'cgi'};
my $mode = $cgi->param('mode');
}
}
-# 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);
- 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('SCRIPT',$script);
-
- my $output = header(-type => 'text/html');
- $output .= $tpl->get_template;
-
- return \$output;
- }
-}
-
# exec_about()
#
# Display some information about Dev-Editor
$tpl->fillin('PID',$$);
- # Check if the functions getpwuid() and getgrgid() are available
+ # The following information is only available on systems supporting
+ # users and groups
if($users)
{
git.p6c8.net / devedit.git / blobdiff