- Tool.pm: Be consistent (lc instead of uc)

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index f9de6fcb0f0b4d42d2d2e2b9325752e18eb12d65..431eb4dea6bc8ba22964cb6dc2762be0e99250c1 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -5,39 +5,53 @@ package Command;
 #
 # Execute Dev-Editor's commands
 #
 #
 # Execute Dev-Editor's commands
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-03-01
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2010-05-24
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2009 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 1.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).

 #
 
 use strict;
 
 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 HTML::Entities;
+use CGI qw(header
+           escape);
+

 use Output;
 use Template;
 
 use Output;
 use Template;
 

-my $script = $ENV{'SCRIPT_NAME'};
-
-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,
-                'unlock'     => \&exec_unlock
+my $script = encode_html($ENV{'SCRIPT_NAME'});
+my $users  = eval('getpwuid(0)') && eval('getgrgid(0)');
+
+my %dispatch = ('show'         => \&exec_show,
+                'beginedit'    => \&exec_beginedit,
+                'endedit'      => \&exec_endedit,
+                'download'     => \&exec_download,
+                'mkdir'        => \&exec_mkdir,
+                'mkfile'       => \&exec_mkfile,
+                'upload'       => \&exec_upload,
+                'copy'         => \&exec_copy,
+                'rename'       => \&exec_rename,
+                'remove'       => \&exec_remove,
+                'remove_multi' => \&exec_remove_multi,
+                'chprop'       => \&exec_chprop,
+                'about'        => \&exec_about

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


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

- return error($config->{'err_cmd_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_html($command)});

 }
 
 # exec_show()
 }
 
 # exec_show()


@@ -80,33 +100,44 @@ 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 $upper_path     = multi_string(upper_path($virtual));

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

- if(-d $physical)
+ if(-d $physical && not -l $physical)

  {
   # Create directory listing
 
  {
   # Create directory listing
 

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

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

-  return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$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 $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 

-  my $dirlist = "";
+  my $dirlist = '';
+
+  my $count = 0;
+
+  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."/..");
+   $count++;
+
+   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->{'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;
   }
 
    $dirlist .= $udtpl->get_template;
   }


@@ -115,15 +146,29 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
 
   foreach my $dir(@$dirs)
   {

-   my @stat      = stat($physical."/".$dir);
-   my $virt_path = encode_entities($virtual.$dir."/");
+   next if($config->{'hide_dot_files'} && substr($dir,0,1) eq '.');
+   next unless(dos_wildcard_match($filter1,$dir));
+
+   $count++;
+
+   my $phys_path = $physical.'/'.$dir;
+   my $virt_path = multi_string($virtual.$dir.'/');
+
+   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->{'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->fillin("DIR",$virt_path);
-   $dtpl->fillin("DIR_NAME",$dir);
-   $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $dtpl->parse_if_block('forbidden',is_forbidden_file($config->{'forbidden'},$virt_path->{'normal'}));
+   $dtpl->parse_if_block('readable',-r $phys_path && -x $phys_path);
+   $dtpl->parse_if_block('users',$users && -o $phys_path);
+   $dtpl->parse_if_block('even',($count % 2) == 0);

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


@@ -132,74 +177,114 @@ sub exec_show($$)
 
   foreach my $file(@$files)
   {
 
   foreach my $file(@$files)
   {

-   my $phys_path = $physical."/".$file;
-   my $virt_path = encode_entities($virtual.$file);
+   next if($config->{'hide_dot_files'} && substr($file,0,1) eq '.');
+   next unless(dos_wildcard_match($filter1,$file));

 
 

-   my @stat      = stat($phys_path);
-   my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
+   $count++;
+
+   my $phys_path = $physical.'/'.$file;
+   my $virt_path = multi_string($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->{'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_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->fillin("FILE",$virt_path);
-   $ftpl->fillin("FILE_NAME",$file);
-   $ftpl->fillin("SIZE",$stat[7]);
-   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $ftpl->parse_if_block('link',-l $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("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('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 -l $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('too_large',$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});

 
 

-   $ftpl->parse_if_block("in_use",$in_use);
-   $ftpl->parse_if_block("unused",not $in_use);
+   $ftpl->parse_if_block('users',$users && -o $phys_path);
+
+   $ftpl->parse_if_block('even',($count % 2) == 0);

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

-  $tpl->read_file($config->{'tpl_dirlist'});
+  $tpl->read_file($config->{'templates'}->{'dirlist'});
+
+  $tpl->fillin('DIRLIST',$dirlist);
+  $tpl->fillin('DIR',encode_html($virtual));
+  $tpl->fillin('DIR_URL',escape($virtual));
+  $tpl->fillin('SCRIPT',$script);
+  $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));

 
 

-  $tpl->fillin("DIRLIST",$dirlist);
-  $tpl->fillin("DIR",$virtual);
-  $tpl->fillin("SCRIPT",$script);
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $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',-w $physical);
+  $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_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_html($link_target));

  }
  else
  {
   # View a file
 
  }
  else
  {
   # View a file
 

-  return error($config->{'err_noview'},upper_path($virtual)) unless(-r $physical);
+  return error($config->{'errors'}->{'no_view'},$upper_path->{'normal'}) 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->{'normal'}) unless(-T $physical);

 
 

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

 
 

-   my $content =  file_read($physical);
-   $$content   =~ s/\015\012|\012|\015/\n/g;
+  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'});

 
 

-   $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;
+
+  $tpl->read_file($config->{'templates'}->{'viewfile'});
+
+  $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);
+
+  $tpl->fillin('CONTENT',encode_html($$content));

  }
 
  }
 

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

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


@@ -219,62 +304,44 @@ 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);

 
 

- 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);
-  $$content   =~ s/\015\012|\012|\015/\n/g;
+ # 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',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);
+ $tpl->fillin('MD5SUM',$md5sum);
+ $tpl->fillin('CONTENT',encode_html($$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 $output = header(-type => 'text/html');
+ $output   .= $tpl->get_template;

 
 

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

 }
 
 # exec_endedit()
 }
 
 # exec_endedit()


@@ -291,50 +358,117 @@ 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 $uselist        = $data->{'uselist'};
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};
+ my $content        = $cgi->param('filecontent');
+ my $md5sum         = $cgi->param('md5sum');
+ my $output;

 
 

- # Normalize newlines
+ if(defined $content && $md5sum)
+ {
+  # Normalize newlines

 
 

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

 
 

- if($data->{'cgi'}->param('encode_iso'))
- {
-  # Encode all ISO-8859-1 special chars
+  if($cgi->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')
+  {
+   # Create the new filename

 
 

-  $content = encode_entities($content,"\200-\377");
- }
+   $physical = $data->{'new_physical'};
+   $virtual  = $data->{'new_virtual'};
+  }

 
 

- if($data->{'cgi'}->param('saveas'))
- {
-  # Create the new filename
+  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);

 
 

-  $physical = $data->{'new_physical'};
-  $virtual  = $data->{'new_virtual'};
+  # For technical reasons, we can't use file_save() for
+  # saving the file...

 
 

-  # Check if someone else is editing the new file
+  local *FILE;

 
 

-  return error_in_use($virtual) if($uselist->in_use($virtual));
- }
+  sysopen(FILE,$physical,O_RDWR | O_CREAT) or return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => encode_html($virtual)});
+  file_lock(*FILE,LOCK_EX)                 or do { close(FILE); return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => encode_html($virtual)}) };

 
 

- return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
- return error($config->{'err_noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical);
+  my $md5 = new Digest::MD5;
+  $md5->addfile(*FILE);

 
 

- if(file_save($physical,\$content))
- {
-  # Saving of the file was successful - so unlock it!
+  my $md5file = $md5->hexdigest;
+  my $md5data = md5_hex($content);

 
 

-  file_unlock($uselist,$data->{'virtual'});
-  #                    ^^^^^^^^^^^^^^^^^^
-  # Maybe the user saved the file using another filename...
-  # But we have to unlock the original file!
+  if($md5file ne $md5sum && $md5data ne $md5file && not $cgi->param('saveas'))
+  {
+   # The file changed meanwhile

 
 

-  return devedit_reload({command => 'show', file => upper_path($virtual)});
- }
- else
- {
-  return error($config->{'err_edit_failed'},upper_path($virtual),{FILE => $virtual});
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'editfile'});
+
+   $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',encode_html(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 = ($cgi->param('continue'))
+           ? devedit_reload({command => 'beginedit', file => $virtual})
+           : devedit_reload({command => 'show', file => $dir});
+  }
+
+  close(FILE);
+
+  return $output;

  }
  }

+
+ return devedit_reload({command => 'beginedit', file => $virtual});
+}
+
+# exec_download()
+#
+# Execute a HTTP download of a file
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_download($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($virtual);
+
+ return return error($config->{'errors'}->{'no_download'},$dir,{FILE => $virtual}) if(-d $physical || -l $physical);
+
+ my $filename = file_name($virtual);
+
+ my $output = header(-type => 'application/octet-stream', -attachment => $filename);
+ $output   .= ${ file_read($physical,1) };
+
+ return \$output;

 }
 
 # exec_mkfile()
 }
 
 # exec_mkfile()


@@ -352,12 +486,36 @@ sub exec_mkfile($$)
  my $new_physical   = $data->{'new_physical'};
  my $new_virtual    = $data->{'new_virtual'};
  my $dir            = upper_path($new_virtual);
  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)
+ {
+  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});
+  
+  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->fillin('DIR','/');
+  $tpl->fillin('SCRIPT',$script);

 
 

- return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+  my $output = header(-type => 'text/html');
+  $output   .= $tpl->get_template;

 
 

- file_create($new_physical) or return error($config->{'err_mkfile_failed'},$dir,{FILE => $new_virtual});
- return devedit_reload({command => 'show', file => $dir});
+  return \$output;
+ }

 }
 
 # exec_mkdir()
 }
 
 # exec_mkdir()


@@ -375,17 +533,33 @@ sub exec_mkdir($$)
  my $new_physical   = $data->{'new_physical'};
  my $new_virtual    = $data->{'new_virtual'};
  my $dir            = upper_path($new_virtual);
  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)
+ {
+  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);

 
 

- return error($config->{'err_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'});

 
 

- mkdir($new_physical,0777) or return error($config->{'err_mkdir_failed'},$dir,{DIR => $new_virtual});
- 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_upload()
 #
 }
 
 # exec_upload()
 #

-# Upload a file
+# Process a file upload

 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash


@@ -399,46 +573,57 @@ sub exec_upload($$)
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 

+ return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => encode_html($virtual)}) unless(-d $physical && not -l $physical);
+ return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => encode_html($virtual)})             unless(-w $physical);
+

  if(my $uploaded_file = $cgi->param('uploaded_file'))
  {
  if(my $uploaded_file = $cgi->param('uploaded_file'))
  {

-  # Process file upload
+  if($cgi->param('remote_file'))
+  {
+   $uploaded_file = $cgi->param('remote_file');

 
 

-  my $filename  = file_name($uploaded_file);
-  my $file_phys = $physical."/".$filename;
-  my $file_virt = $virtual."".$filename;
+   $uploaded_file =~ s!/!!g;
+   $uploaded_file =~ s!\\!!g;
+  }

 
 

-  return error($config->{'err_file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys);
+  # Process file upload

 
 

-  my $ascii     = $cgi->param('ascii');
-  my $handle    = $cgi->upload('uploaded_file');
+  my $filename  = file_name($uploaded_file);
+  my $file_phys = $physical.'/'.$filename;
+  my $file_virt = encode_html($virtual.$filename);

 
 

-  local *FILE;
+  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'));
+  }

 
 

-  open(FILE,">$file_phys") or return error($config->{'err_mkfile_failed'},$virtual,{FILE => $file_virt});
-  binmode(FILE) unless($ascii);
+  my $ascii  = $cgi->param('ascii');
+  my $handle = $cgi->upload('uploaded_file');

 
 

-  my $data;
+  return error($config->{'errors'}->{'invalid_upload'},$virtual) unless($handle);

 
 

-  while(read($handle,$data,1024))
-  {
-   $data =~ s/\015\012|\012|\015/\n/g if($ascii);
-   print FILE $data;
-  }
+  # Read transferred file and write it to disk

 
 

-  close(FILE);
+  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});

 
 

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

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

-  $tpl->read_file($config->{'tpl_upload'});
+  $tpl->read_file($config->{'templates'}->{'upload'});

 
 

-  $tpl->fillin("DIR",$virtual);
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-  $tpl->fillin("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);

 
 

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

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


@@ -458,63 +643,96 @@ sub exec_copy($$)
 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
 {
  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'};
 
  my $new_physical   = $data->{'new_physical'};
 

- return error($config->{'err_nocopy'}) unless(-r $physical);
+ return error($config->{'errors'}->{'link_copy'},$dir) if(-l $physical);
+ return error($config->{'errors'}->{'no_copy'},$dir)   unless(-r $physical);

 
  if($new_physical)
  {
 
  if($new_physical)
  {

-  my $new_virtual = $data->{'new_virtual'};
-  my $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)
+  if(-d $physical)

   {
   {

-   return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+   return error($config->{'errors'}->{'no_copy'},$dir)                                      unless(-x $physical);
+   return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual->{'html'}}) if(-e $new_physical);
+   return error($config->{'errors'}->{'dir_copy_self'},$dir)                                if(index($new_virtual->{'normal'},$virtual) == 0);

 
 

-   if(-d $new_physical)
+   dir_copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+   return devedit_reload({command => 'show', file => $new_dir});
+  }
+  else
+  {
+   if(-e $new_physical)

    {
    {

-    return error($config->{'err_dircopy'});
+    return error($config->{'errors'}->{'link_replace'},$new_dir)                                    if(-l $new_physical);
+    return error($config->{'errors'}->{'dir_replace'},$new_dir)                                     if(-d $new_physical);
+    return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual->{'html'}}) unless(-w $new_physical);
+
+    if(not $data->{'cgi'}->param('confirmed'))
+    {
+     my $tpl = new Template;
+     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+     $tpl->fillin('FILE',encode_html($virtual));
+     $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+     $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+     $tpl->fillin('NEW_DIR',encode_html($new_dir));
+     $tpl->fillin('DIR',encode_html($dir));
+     $tpl->fillin('DIR_URL',escape($dir));
+
+     $tpl->fillin('COMMAND','copy');
+     $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+     $tpl->fillin('SCRIPT',$script);
+
+     my $output = header(-type => 'text/html');
+     $output   .= $tpl->get_template;
+
+     return \$output;
+    }

    }
    }

-   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("NEW_FILENAME",file_name($new_virtual));
-    $tpl->fillin("NEW_DIR",$dir);
-    $tpl->fillin("DIR",upper_path($virtual));
-    $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;
-   }
+   copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => encode_html($virtual), NEW_FILE => $new_virtual->{'html'}});
+   return devedit_reload({command => 'show', file => $new_dir});

   }
   }

-
-  copy($physical,$new_physical) or return error($config->{'err_copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
-  return devedit_reload({command => 'show', file => $dir});

  }
  else
  {
  }
  else
  {

-  my $tpl = new Template;
-  $tpl->read_file($config->{'tpl_copyfile'});
+  if(-d $physical)
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'copydir'});

 
 

-  $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',encode_html($virtual));
+   $tpl->fillin('DIR',encode_html($dir));
+   $tpl->fillin('DIR_URL',escape($dir));
+   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->fillin('SCRIPT',$script);

 
 

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

 
 

-  return \$output;
+   return \$output;
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'copyfile'});
+
+   $tpl->fillin('FILE',encode_html($virtual));
+   $tpl->fillin('DIR',encode_html($dir));
+   $tpl->fillin('DIR_URL',escape($dir));
+   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->fillin('SCRIPT',$script);
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }

  }
 }
 
  }
 }
 


@@ -532,59 +750,59 @@ 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'};
 

- 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($new_physical)
  {
 
  if($new_physical)
  {

-  my $new_virtual = $data->{'new_virtual'};
-  my $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)
   {
 
   if(-e $new_physical)
   {

-   return error($config->{'err_exist_edited'},$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);

 
 

-   if(-d $new_physical)
-   {
-    return error($config->{'err_dircopy'});
-   }
-   elsif(not $data->{'cgi'}->param('confirmed'))
+   if(not $data->{'cgi'}->param('confirmed'))

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

-    $tpl->read_file($config->{'tpl_confirm_replace'});
-
-    $tpl->fillin("FILE",$virtual);
-    $tpl->fillin("NEW_FILE",$new_virtual);
-    $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
-    $tpl->fillin("NEW_DIR",$dir);
-    $tpl->fillin("DIR",upper_path($virtual));
-    $tpl->fillin("COMMAND","rename");
-    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-    $tpl->fillin("SCRIPT",$script);
-
-    my $output = header(-type => "text/html");
+    $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+    $tpl->fillin('FILE',encode_html($virtual));
+    $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+    $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+    $tpl->fillin('NEW_DIR',encode_html($new_dir));
+    $tpl->fillin('DIR',encode_html($dir));
+
+    $tpl->fillin('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;
 
     return \$output;
    }
   }
 
     $output   .= $tpl->get_template;
 
     return \$output;
    }
   }
 

-  rename($physical,$new_physical) or return error($config->{'err_rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
-  return devedit_reload({command => 'show', file => $dir});
+  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;
  }
  else
  {
   my $tpl = new Template;

-  $tpl->read_file($config->{'tpl_renamefile'});
+  $tpl->read_file($config->{'templates'}->{'renamefile'});

 
 

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

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


@@ -605,27 +823,33 @@ 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',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");
+   my $output = header(-type => 'text/html');

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


@@ -635,24 +859,24 @@ 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_delete_failed'},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',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");
+   my $output = header(-type => 'text/html');

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


@@ -660,43 +884,359 @@ sub exec_remove($$)
  }
 }
 
  }
 }
 

-# exec_unlock()
+# exec_remove_multi()

 #
 #

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

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

-sub exec_unlock($$)
+sub exec_remove_multi($$)

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

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

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

+ my $cgi            = $data->{'cgi'};
+
+ my @files = $cgi->param('files');#
+ my @new_files;

 
 

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

  {
  {

-  file_unlock($data->{'uselist'},$virtual);
-  return devedit_reload({command => 'show', file => upper_path($virtual)});
+  foreach my $file(@files)
+  {
+   # Filter out some "bad" files (e.g. files going up in the
+   # directory hierarchy or files containing slashes (it's too
+   # dangerous...)
+
+   next if($file =~ m!^\.+$!);
+   next if($file =~ m!/!);
+   next if($file =~ m!\\!);
+
+   push(@new_files,$file);
+  }
+ }
+
+ if(@new_files)
+ {
+  if($cgi->param('confirmed'))
+  {
+   my @success;
+   my @failed;
+
+   foreach my $file(@new_files)
+   {
+    my $file_path = clean_path($physical.'/'.$file);
+
+    if(-e $file_path)
+    {
+     if(-d $file_path && not -l $file_path)
+     {
+      # Remove a directory
+
+      if(rmtree($file_path))
+      {
+       push(@success,clean_path($file));
+      }
+      else
+      {
+       push(@failed,clean_path($file));
+      }
+     }
+     else
+     {
+      # Remove a file
+
+      if(unlink($file_path))
+      {
+       push(@success,clean_path($file));
+      }
+      else
+      {
+       push(@failed,clean_path($file));
+      }
+     }
+    }
+    else
+    {
+     push(@failed,clean_path($file));
+    }
+   }
+
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'rmmulti'});
+
+   if(scalar(@success) > 0)
+   {
+    if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0)
+    {
+     return devedit_reload({command => 'show', file => $virtual});
+    }
+    else
+    {
+     $tpl->parse_if_block('success',1);
+
+     foreach my $file_success(@success)
+     {
+      $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
+                                     FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))});
+     }
+
+     $tpl->parse_loop('SUCCESS');
+    }
+   }
+   else
+   {
+    $tpl->parse_if_block('success',0);
+   }
+
+   if(scalar(@failed) > 0)
+   {
+    $tpl->parse_if_block('failed',1);
+
+    foreach my $file_failed(@failed)
+    {
+     $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed),
+                                   FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))});
+    }
+
+    $tpl->parse_loop('FAILED');
+   }
+   else
+   {
+    $tpl->parse_if_block('failed',0);
+   }
+
+
+   $tpl->fillin('DIR',encode_html($virtual));
+   $tpl->fillin('SCRIPT',$script);
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'confirm_rmmulti'});
+
+   foreach my $file(@new_files)
+   {
+    $tpl->add_loop_data('FILES',{FILE => encode_html($file),
+                                 FILE_PATH => encode_html(clean_path($virtual.'/'.$file))});
+   }
+
+   $tpl->parse_loop('FILES');
+
+   $tpl->fillin('COUNT',scalar(@new_files));
+
+   $tpl->fillin('DIR',encode_html($virtual));
+   $tpl->fillin('SCRIPT',$script);
+
+   my $output = header(-type => 'text/html');
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }

  }
  else
  {
  }
  else
  {

+  return devedit_reload({command => 'show', file => $virtual});
+ }
+}
+
+# exec_chprop()
+#
+# 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)
+
+sub exec_chprop($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($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');
+ my $group = $cgi->param('group');
+
+ if($mode || $group)
+ {
+  if($mode)
+  {
+   # Change the mode
+
+   return error($config->{'errors'}->{'invalid_mode'},$dir) unless($mode =~ /^[0-7]{3,}$/);
+   chmod(oct($mode),$physical);
+  }
+
+  if($group)
+  {
+   # Change the group using the `chgrp` system command
+
+   return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_html($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
+   system('chgrp',$group,$physical);
+  }
+
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ 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_html($group));
+   $tpl->parse_if_block('group_detected',1);
+  }
+  else
+  {
+   $tpl->parse_if_block('group_detected',0);
+  }
+
+  # Insert other information
+
+  $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;
 
   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_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_html($^X));
+ $tpl->fillin('PERL_VER', sprintf('%vd',$^V));
+
+ # Information about the server
+
+ $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->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);
+
+  # IDs 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_html($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_html($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;