- Do not write new file content if the user did not change it

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index d84d42f0ab2dba1579ca3077aa11918adbfa7f2c..52823967c7439a252a7b17d9c4585c6edc063529 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -5,38 +5,46 @@ package Command;
 #
 # Execute Dev-Editor's commands
 #
 #
 # Execute Dev-Editor's commands
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-02-06
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-04-15

 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 

+use Fcntl;

 use File::Access;
 use File::Copy;
 use File::Path;
 
 use File::Access;
 use File::Copy;
 use File::Path;
 

+use Digest::MD5 qw(md5_hex);

 use POSIX qw(strftime);
 use Tool;
 
 use POSIX qw(strftime);
 use Tool;
 

-use CGI qw(header);
+use CGI qw(header
+           escape);
+

 use HTML::Entities;
 use Output;
 use Template;
 
 use HTML::Entities;
 use Output;
 use Template;
 

-my $script = $ENV{'SCRIPT_NAME'};
+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,
 
 my %dispatch = ('show'       => \&exec_show,
                 'beginedit'  => \&exec_beginedit,

-                'canceledit' => \&exec_canceledit,

                 'endedit'    => \&exec_endedit,
                 'mkdir'      => \&exec_mkdir,
                 'mkfile'     => \&exec_mkfile,
                 'endedit'    => \&exec_endedit,
                 'mkdir'      => \&exec_mkdir,
                 'mkfile'     => \&exec_mkfile,

+                'upload'     => \&exec_upload,

                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,
                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,

-                'unlock'     => \&exec_unlock
+                'chprop'     => \&exec_chprop,
+                'about'      => \&exec_about

                );
 
 ### Export ###
                );
 
 ### Export ###


@@ -59,10 +67,16 @@ sub exec_command($$$)
 {
  my ($command,$data,$config) = @_;
 
 {
  my ($command,$data,$config) = @_;
 

- return error("Unknown command: $command") unless($dispatch{$command});
+ foreach(keys(%dispatch))
+ {
+  if(lc($_) eq lc($command))
+  {
+   my $output = &{$dispatch{$_}}($data,$config);
+   return $output;
+  }
+ }

 
 

- my $output = &{$dispatch{$command}}($data,$config);
- return $output;
+ return error($config->{'errors'}->{'command_unknown'},'/',{COMMAND => encode_entities($command)});

 }
 
 # exec_show()
 }
 
 # exec_show()


@@ -79,32 +93,41 @@ sub exec_show($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

- my $output;
+ my $upper_path     = encode_entities(upper_path($virtual));

 
 

- if(-d $physical)
+ my $tpl = new Template;
+
+ if(-d $physical && not -l $physical)

  {
   # Create directory listing
 
  {
   # Create directory listing
 

+  return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
+

   my $direntries = dir_read($physical);
   my $direntries = dir_read($physical);

-  return error("Reading of directory $virtual failed.",upper_path($virtual)) unless($direntries);
+  return error($config->{'dir_read_fail'},$upper_path,{DIR => encode_entities($virtual)}) unless($direntries);

 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 

-  my $dirlist = "";
+  my $dir_writeable = -w $physical;
+
+  my $dirlist = '';
+
+  my $filter1 = $data->{'cgi'}->param('filter') || '*';        # The real wildcard
+  my $filter2 = ($filter1 && $filter1 ne '*') ? $filter1 : ''; # Wildcard for output

 
   # Create the link to the upper directory
 
   # 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 "/")
+  unless($virtual eq '/')

   {
   {

-   my @stat  = stat($physical."/..");
+   my @stat  = stat($physical.'/..');

 
    my $udtpl = new Template;
 
    my $udtpl = new Template;

-   $udtpl->read_file($config->{'tpl_dirlist_up'});
+   $udtpl->read_file($config->{'templates'}->{'dirlist_up'});

 
 

-   $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
-   $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $udtpl->fillin('UPPER_DIR',$upper_path);
+   $udtpl->fillin('DATE',encode_entities(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime($stat[9]) : localtime($stat[9]))));

 
    $dirlist .= $udtpl->get_template;
   }
 
    $dirlist .= $udtpl->get_template;
   }


@@ -113,15 +136,23 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
 
   foreach my $dir(@$dirs)
   {

-   my @stat      = stat($physical."/".$dir);
-   my $virt_path = encode_entities($virtual.$dir."/");
+   next unless(dos_wildcard_match($filter1,$dir));
+
+   my $phys_path = $physical.'/'.$dir;
+   my $virt_path = encode_entities($virtual.$dir.'/');
+
+   my @stat      = stat($phys_path);

 
    my $dtpl = new Template;
 
    my $dtpl = new Template;

-   $dtpl->read_file($config->{'tpl_dirlist_dir'});
+   $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);
-   $dtpl->fillin("DIR_NAME",$dir);
-   $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $dtpl->parse_if_block('readable',-r $phys_path && -x $phys_path);
+   $dtpl->parse_if_block('users',$users && -o $phys_path);

 
    $dirlist .= $dtpl->get_template;
   }
 
    $dirlist .= $dtpl->get_template;
   }


@@ -130,80 +161,105 @@ sub exec_show($$)
 
   foreach my $file(@$files)
   {
 
   foreach my $file(@$files)
   {

-   my $phys_path = $physical."/".$file;
+   next unless(dos_wildcard_match($filter1,$file));
+
+   my $phys_path = $physical.'/'.$file;

    my $virt_path = encode_entities($virtual.$file);
 
    my $virt_path = encode_entities($virtual.$file);
 

-   my @stat      = stat($phys_path);
-   my $in_use    = $data->{'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;
 
    my $ftpl = new Template;

-   $ftpl->read_file($config->{'tpl_dirlist_file'});
+   $ftpl->read_file($config->{'templates'}->{'dirlist_file'});

 
 

-   $ftpl->fillin("FILE",$virt_path);
-   $ftpl->fillin("FILE_NAME",$file);
-   $ftpl->fillin("SIZE",$stat[7]);
-   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $ftpl->fillin('FILE',$virt_path);
+   $ftpl->fillin('FILE_NAME',encode_entities($file));
+   $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->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('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);
-   $ftpl->parse_if_block("editable",-w $phys_path && -r $phys_path && -T $phys_path && 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("in_use",$in_use);
-   $ftpl->parse_if_block("unused",not $in_use);
+   $ftpl->parse_if_block('too_large',$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
+
+   $ftpl->parse_if_block('users',$users && -o $phys_path);

 
    $dirlist .= $ftpl->get_template;
   }
 
 
    $dirlist .= $ftpl->get_template;
   }
 

-  my $tpl = new Template;
-  $tpl->read_file($config->{'tpl_dirlist'});
+  $tpl->read_file($config->{'templates'}->{'dirlist'});
+
+  $tpl->fillin('DIRLIST',$dirlist);
+  $tpl->fillin('DIR',encode_entities($virtual));
+  $tpl->fillin('SCRIPT',$script);
+  $tpl->fillin('URL',encode_entities(equal_url($config->{'httproot'},$virtual)));
+
+  $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->fillin("DIRLIST",$dirlist);
-  $tpl->fillin("DIR",$virtual);
-  $tpl->fillin("SCRIPT",$script);
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->read_file($config->{'templates'}->{'viewlink'});

 
 

-  $output  = header(-type => "text/html");
-  $output .= $tpl->get_template;
+  $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
 
  }
  else
  {
   # View a file
 

-  return error("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical);
+  return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);

 
   # Check on binary files
 
   # Check on binary files

-  # We have to do it in this way, or empty files
-  # will be recognized as binary files
+  # We have to do it in this way or empty files will be recognized
+  # as binary files

 
 

-  unless(-T $physical)
-  {
-   # Binary file
+  return error($config->{'errors'}->{'binary_file'},$upper_path) unless(-T $physical);

 
 

-   return error($config->{'err_binary'},upper_path($virtual));
-  }
-  else
-  {
-   # Text file
+  # Is the file too large?

 
 

-   my $content = file_read($physical);
+  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'});

 
 

-   my $tpl = new Template;
-   $tpl->read_file($config->{'tpl_viewfile'});
+  # View the file

 
 

-   $tpl->fillin("FILE",$virtual);
-   $tpl->fillin("DIR",upper_path($virtual));
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
-   $tpl->fillin("CONTENT",encode_entities($$content));
+  my $content =  file_read($physical);
+  $$content   =~ s/\015\012|\012|\015/\n/g;

 
 

-   $output  = header(-type => "text/html");
-   $output .= $tpl->get_template;
-  }
+  $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('SCRIPT',$script);
+
+  $tpl->parse_if_block('editable',-w $physical);
+
+  $tpl->fillin('CONTENT',encode_entities($$content));

  }
 
  }
 

+ my $output  = header(-type => 'text/html');
+ $output    .= $tpl->get_template;
+

  return \$output;
 }
 
  return \$output;
 }
 


@@ -221,62 +277,43 @@ sub exec_beginedit($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

- my $uselist        = $data->{'uselist'};
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};

 
 

- return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
- return error_in_use($virtual) if($uselist->in_use($virtual));
- return error($config->{'err_noedit'},upper_path($virtual)) 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
 
 
  # Check on binary files
 

- unless(-T $physical)
- {
-  # Binary file
+ return error($config->{'errors'}->{'binary_file'},$dir) unless(-T $physical);

 
 

-  return error($config->{'err_binary'},upper_path($virtual));
- }
- else
- {
-  # Text file
+ # Is the file too large?

 
 

-  $uselist->add_file($virtual);
-  $uselist->save;
+ return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}}) if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'});

 
 

-  my $content = file_read($physical);
+ # ... and show the editing form

 
 

-  my $tpl = new Template;
-  $tpl->read_file($config->{'tpl_editfile'});
+ my $content =  file_read($physical);
+ my $md5sum  =  md5_hex($$content);
+ $$content   =~ s/\015\012|\012|\015/\n/g;

 
 

-  $tpl->fillin("FILE",$virtual);
-  $tpl->fillin("DIR",upper_path($virtual));
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-  $tpl->fillin("SCRIPT",$script);
-  $tpl->fillin("CONTENT",encode_entities($$content));
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'editfile'});

 
 

-  my $output = header(-type => "text/html");
-  $output   .= $tpl->get_template;
+ $tpl->fillin('FILE',$virtual);
+ $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));

 
 

-  return \$output;
- }
-}
+ $tpl->parse_if_block('error',0);

 
 

-# 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 $uselist        = $data->{'uselist'};
+ my $output = header(-type => 'text/html');
+ $output   .= $tpl->get_template;

 
 

- file_unlock($uselist,$virtual);
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ return \$output;

 }
 
 # exec_endedit()
 }
 
 # exec_endedit()


@@ -293,41 +330,91 @@ sub exec_endedit($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

- my $content        = $data->{'cgi'}->param('filecontent');
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};
+ my $content        = $cgi->param('filecontent');
+ my $md5sum         = $cgi->param('md5sum');
+ my $output;

 
 

- return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
- return error($config->{'err_noedit'},upper_path($virtual)) unless(-r $physical && -w $physical);
+ if(defined $content && $md5sum)
+ {
+  # Normalize newlines

 
 

- # Normalize newlines
+  $content =~ s/\015\012|\012|\015/\n/g;

 
 

- $content =~ s/\015\012|\012|\015/\n/g;
+  if($cgi->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')
+  {
+   # Create the new filename

 
 

- if($data->{'cgi'}->param('encode_iso'))
- {
-  # Encode all ISO-8859-1 special chars
+   $physical = $data->{'new_physical'};
+   $virtual  = $data->{'new_virtual'};
+  }

 
 

-  $content = encode_entities($content,"\200-\377");
- }
+  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($data->{'cgi'}->param('saveas'))
- {
-  # Create the new filename
+  # For technical reasons, we can't use file_save() for
+  # saving the file...

 
 

-  $physical = $data->{'new_physical'};
-  $virtual  = $data->{'new_virtual'};
- }
+  local *FILE;

 
 

- if(file_save($physical,\$content))
- {
-  # Saving of the file was successful - so unlock it!
+  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}) };

 
 

-  file_unlock($data->{'uselist'},$virtual);
-  return devedit_reload({command => 'show', file => upper_path($virtual)});
- }
- else
- {
-  return error($config->{'err_editfailed'},upper_path($virtual),{FILE => $virtual});
+  my $md5 = new Digest::MD5;
+  $md5->addfile(*FILE);
+
+  my $md5file = $md5->hexdigest;
+  my $md5data = md5_hex($content);
+
+  if($md5file ne $md5sum && $md5data ne $md5file && not $cgi->param('saveas'))
+  {
+   # The file changed meanwhile
+
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'editfile'});
+
+   $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',$md5file);
+   $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!
+
+   if($md5data ne $md5file)
+   {
+    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_mkfile()


@@ -347,10 +434,26 @@ sub exec_mkfile($$)
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 

- return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
+ if($new_physical)
+ {
+  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});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkfile'});

 
 

- file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+  $tpl->fillin('DIR','/');
+  $tpl->fillin('SCRIPT',$script);
+
+  my $output = header(-type => 'text/html');
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

 }
 
 # exec_mkdir()
 }
 
 # exec_mkdir()


@@ -370,10 +473,90 @@ sub exec_mkdir($$)
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 
  my $dir            = upper_path($new_virtual);
  $new_virtual       = encode_entities($new_virtual);
 

- return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
+ if($new_physical)
+ {
+  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+
+  mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkdir'});
+
+  $tpl->fillin('DIR','/');
+  $tpl->fillin('SCRIPT',$script);
+
+  my $output = header(-type => 'text/html');
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }
+}
+
+# exec_upload()
+#
+# Process a file upload
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_upload($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ 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);
+
+ if(my $uploaded_file = $cgi->param('uploaded_file'))
+ {
+  # Process file upload
+
+  my $filename  = file_name($uploaded_file);
+  my $file_phys = $physical.'/'.$filename;
+  my $file_virt = $virtual.$filename;
+
+  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 $ascii  = $cgi->param('ascii');
+  my $handle = $cgi->upload('uploaded_file');
+
+  return error($config->{'errors'}->{'invalid_upload'},$virtual) unless($handle);
+
+  # Read transferred file and write it to disk
+
+  read($handle, my $data, -s $handle);
+  $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});

 
 

- mkdir($new_physical,0777) or return error("Could not create directory '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+  return devedit_reload({command => 'show', file => $virtual});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'upload'});
+
+  $tpl->fillin('DIR',$virtual);
+  $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_copy()
 }
 
 # exec_copy()


@@ -390,46 +573,65 @@ sub exec_copy($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = encode_entities($data->{'virtual'});
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = encode_entities($data->{'virtual'});

+ my $dir            = upper_path($virtual);

  my $new_physical   = $data->{'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);

 
 

- return error("This editor is not able to copy directories.") if(-d $physical);
- return error("You have not enough permissions to copy this file.") 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(-e $new_physical)
+ if($new_physical)

  {
  {

-  if(-d $new_physical)
+  my $new_virtual = $data->{'new_virtual'};
+  my $new_dir     = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);
+
+  if(-e $new_physical)

   {
   {

-   return error("A directory called '$new_virtual' already exists. You cannot replace a directory by a file!",$dir);
+   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);
+
+   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('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;
+   }

   }
   }

-  elsif(not $data->{'cgi'}->param('confirmed'))
-  {
-   my $tpl = new Template;
-   $tpl->read_file($config->{'tpl_confirm_replace'});

 
 

-   $tpl->fillin("FILE",$virtual);
-   $tpl->fillin("NEW_FILE",$new_virtual);
-   $tpl->fillin("DIR",upper_path($virtual));
-   $tpl->fillin("COMMAND","copy");
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
+  copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual});
+  return devedit_reload({command => 'show', file => $new_dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'copyfile'});

 
 

-   my $output = header(-type => "text/html");
-   $output   .= $tpl->get_template;
+  $tpl->fillin('FILE',$virtual);
+  $tpl->fillin('DIR',$dir);
+  $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin('SCRIPT',$script);

 
 

-   return \$output;
-  }
- }
+  my $output = header(-type => 'text/html');
+  $output   .= $tpl->get_template;

 
 

- if($data->{'uselist'}->in_use($data->{'new_virtual'}))
- {
-  return error("The target file '$new_virtual' already exists and it is edited by someone else.",$dir);
+  return \$output;

  }
  }

-
- copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
- return devedit_reload({command => 'show', file => $dir});

 }
 
 # exec_rename()
 }
 
 # exec_rename()


@@ -446,45 +648,63 @@ sub exec_rename($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

+ my $dir            = upper_path($virtual);

  my $new_physical   = $data->{'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);

 
 

- return error_in_use($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(-e $new_physical)
+ if($new_physical)

  {
  {

-  if(-d $new_physical)
-  {
-   return error("A directory called '$new_virtual' already exists. You cannot replace a directory!",upper_path($virtual));
-  }
-  elsif(not $data->{'cgi'}->param('confirmed'))
+  my $new_virtual = $data->{'new_virtual'};
+  my $new_dir     = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);
+
+  if(-e $new_physical)

   {
   {

-   my $tpl = new Template;
-   $tpl->read_file($config->{'tpl_confirm_replace'});
+   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);

 
 

-   $tpl->fillin("FILE",$virtual);
-   $tpl->fillin("NEW_FILE",$new_virtual);
-   $tpl->fillin("DIR",upper_path($virtual));
-   $tpl->fillin("COMMAND","rename");
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
+   if(not $data->{'cgi'}->param('confirmed'))
+   {
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'confirm_replace'});

 
 

-   my $output = header(-type => "text/html");
-   $output   .= $tpl->get_template;
+    $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);

 
 

-   return \$output;
+    $tpl->fillin('COMMAND','rename');
+    $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin('SCRIPT',$script);
+
+    my $output = header(-type => 'text/html');
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }

   }
   }

- }

 
 

- if($data->{'uselist'}->in_use($data->{'new_virtual'}))
- {
-  return error("The target file '$new_virtual' already exists and it is edited by someone else.",$dir);
+  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
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'renamefile'});
+
+  $tpl->fillin('FILE',$virtual);
+  $tpl->fillin('DIR',$dir);
+  $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin('SCRIPT',$script);

 
 

- rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual));
- return devedit_reload({command => 'show', file => $dir});
+  my $output = header(-type => 'text/html');
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

 }
 
 # exec_remove()
 }
 
 # exec_remove()


@@ -501,27 +721,31 @@ sub exec_remove($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

+ my $dir            = upper_path($virtual);

 
 

- if(-d $physical)
+ return error($config->{'errors'}->{'remove_root'},'/') if($virtual eq '/');
+ return error($config->{'errors'}->{'no_delete'},$dir)  unless(-w upper_path($physical));
+
+ if(-d $physical && not -l $physical)

  {
   # Remove a directory
 
   if($data->{'cgi'}->param('confirmed'))
   {
    rmtree($physical);
  {
   # Remove a directory
 
   if($data->{'cgi'}->param('confirmed'))
   {
    rmtree($physical);

-   return devedit_reload({command => 'show', file => upper_path($virtual)});
+   return devedit_reload({command => 'show', file => $dir});

   }
   else
   {
    my $tpl = new Template;
   }
   else
   {
    my $tpl = new Template;

-   $tpl->read_file($config->{'tpl_confirm_rmdir'});
+   $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});

 
 

-   $tpl->fillin("DIR",$virtual);
-   $tpl->fillin("UPPER_DIR",upper_path($virtual));
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
+   $tpl->fillin('DIR',$virtual);
+   $tpl->fillin('UPPER_DIR',$dir);
+   $tpl->fillin('URL',equal_url($config->{'httproot'},$virtual));
+   $tpl->fillin('SCRIPT',$script);

 
 

-   my $output = header(-type => "text/html");
+   my $output = header(-type => 'text/html');

    $output   .= $tpl->get_template;
 
    return \$output;
    $output   .= $tpl->get_template;
 
    return \$output;


@@ -531,24 +755,22 @@ sub exec_remove($$)
  {
   # Remove a file
 
  {
   # Remove a file
 

-  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
-

   if($data->{'cgi'}->param('confirmed'))
   {
   if($data->{'cgi'}->param('confirmed'))
   {

-   unlink($physical) or return error($config->{'err_editfailed'},upper_path($virtual),{FILE => $virtual});
-   return devedit_reload({command => 'show', file => upper_path($virtual)});
+   unlink($physical) or return error($config->{'errors'}->{'delete_failed'},$dir,{FILE => $virtual});
+   return devedit_reload({command => 'show', file => $dir});

   }
   else
   {
    my $tpl = new Template;
   }
   else
   {
    my $tpl = new Template;

-   $tpl->read_file($config->{'tpl_confirm_rmfile'});
+   $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});

 
 

-   $tpl->fillin("FILE",$virtual);
-   $tpl->fillin("DIR",upper_path($virtual));
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
+   $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");
+   my $output = header(-type => 'text/html');

    $output   .= $tpl->get_template;
 
    return \$output;
    $output   .= $tpl->get_template;
 
    return \$output;


@@ -556,44 +778,192 @@ sub exec_remove($$)
  }
 }
 
  }
 }
 

-# exec_unlock()
+# exec_chprop()

 #
 #

-# Remove a file from the list of used files and
-# return to directory view
+# Change the mode and the group of a file or a directory

 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Return: Output of the command (Scalar Reference)
 
 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Return: Output of the command (Scalar Reference)
 

-sub exec_unlock($$)
+sub exec_chprop($$)

 {
  my ($data,$config) = @_;
 {
  my ($data,$config) = @_;

+ my $physical       = $data->{'physical'};

  my $virtual        = $data->{'virtual'};
  my $virtual        = $data->{'virtual'};

- my $uselist        = $data->{'uselist'};
+ 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);

 
 

- if($data->{'cgi'}->param('confirmed'))
+ my $cgi   = $data->{'cgi'};
+ my $mode  = $cgi->param('mode');
+ my $group = $cgi->param('group');
+
+ if($mode || $group)

  {
  {

-  file_unlock($uselist,$virtual);
-  return devedit_reload({command => 'show', file => upper_path($virtual)});
+  if($mode)
+  {
+   # Change the mode
+
+   chmod(oct($mode),$physical);
+  }
+
+  if($group)
+  {
+   # 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);
+   system('chgrp',$group,$physical);
+  }
+
+  return devedit_reload({command => 'show', file => $dir});

  }
  else
  {
  }
  else
  {

+  # Display the form
+
+  my @stat = stat($physical);
+  my $mode = $stat[2];
+  my $gid  = $stat[5];
+

   my $tpl = new Template;
   my $tpl = new Template;

-  $tpl->read_file($config->{'tpl_confirm_unlock'});
+  $tpl->read_file($config->{'templates'}->{'chprop'});

 
 

-  $tpl->fillin("FILE",$virtual);
-  $tpl->fillin("DIR",upper_path($virtual));
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-  $tpl->fillin("SCRIPT",$script);
+  # Insert file properties into the template

 
 

-  my $output = header(-type => "text/html");
+  $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->fillin('GROUP',encode_entities($group));
+   $tpl->parse_if_block('group_detected',1);
+  }
+  else
+  {
+   $tpl->parse_if_block('group_detected',0);
+  }
+
+  # 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;
  }
 }
 
   $output   .= $tpl->get_template;
 
   return \$output;
  }
 }
 

+# exec_about()
+#
+# Display some information about Dev-Editor
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_about($$)
+{
+ my ($data,$config) = @_;
+
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'about'});
+
+ $tpl->fillin('SCRIPT',$script);
+
+ # Dev-Editor's version number
+
+ $tpl->fillin('VERSION',$data->{'version'});
+
+ # 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'}));
+
+ # Perl
+
+ $tpl->fillin('PERL_PROG',encode_entities($^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->parse_if_block('gmt',$config->{'use_gmt'});
+
+ # Process information
+
+ $tpl->fillin('PID',$$);
+
+ # The following information is only available on systems supporting
+ # users and groups
+
+ if($users)
+ {
+  # Dev-Editor is running on a system which allows users and groups
+  # So we display the user and the group of our process
+
+  my $uid = POSIX::getuid;
+  my $gid = POSIX::getgid;
+
+  $tpl->parse_if_block('users',1);
+
+  # ID's of user and group
+
+  $tpl->fillin('UID',$uid);
+  $tpl->fillin('GID',$gid);
+
+  # Names of user and group
+
+  if(my $user = getpwuid($uid))
+  {
+   $tpl->fillin('USER',encode_entities($user));
+   $tpl->parse_if_block('user_detected',1);
+  }
+  else
+  {
+   $tpl->parse_if_block('user_detected',0);
+  }
+
+  if(my $group = getgrgid($gid))
+  {
+   $tpl->fillin('GROUP',encode_entities($group));
+   $tpl->parse_if_block('group_detected',1);
+  }
+  else
+  {
+   $tpl->parse_if_block('group_detected',0);
+  }
+
+  # Process umask
+
+  $tpl->fillin('UMASK',sprintf('%04o',umask));
+ }
+ else
+ {
+  $tpl->parse_if_block('users',0);
+ }
+
+ my $output = header(-type => 'text/html');
+ $output   .= $tpl->get_template;
+
+ return \$output;
+}
+

 # it's true, baby ;-)
 
 1;
 # it's true, baby ;-)
 
 1;