- When composing the temporary virtual path for a new file, don't call

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index d62643ddc5d195181b7f4cedc5b7b9373c7a30de..bb335dd0b3b36f40c57779642d887f65fe465c74 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2004-12-10
+# Last modified: 2005-01-06

 #
 
 use strict;
 #
 
 use strict;


@@ -20,15 +20,15 @@ use File::Path;
 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;
 

-use Data::Dumper;
-
-my $script = $ENV{'SCRIPT_NAME'};
-my $users  = eval("getpwuid(0)") && eval("getgrgid(0)");
+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,


@@ -74,7 +74,7 @@ sub exec_command($$$)
   }
  }
 
   }
  }
 

- return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command});
+ return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => encode_entities($command)});

 }
 
 # exec_show()
 }
 
 # exec_show()


@@ -91,7 +91,7 @@ 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     = upper_path($virtual);
+ my $upper_path     = encode_entities(upper_path($virtual));

  my $uselist        = $data->{'uselist'};
 
  my $tpl = new Template;
  my $uselist        = $data->{'uselist'};
 
  my $tpl = new Template;


@@ -103,27 +103,30 @@ sub exec_show($$)
   return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
 
   my $direntries = dir_read($physical);
   return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
 
   my $direntries = dir_read($physical);

-  return error($config->{'dir_read_fail'},$upper_path,{DIR => $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 $dir_writeable = -w $physical;
 
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 
   my $dir_writeable = -w $physical;
 

-  my $dirlist = "";
+  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
   # (only if we are not in the root directory)
 
 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 

-  unless($virtual eq "/")
+  unless($virtual eq '/')

   {
   {

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

 
    my $udtpl = new Template;
    $udtpl->read_file($config->{'templates'}->{'dirlist_up'});
 
 
    my $udtpl = new Template;
    $udtpl->read_file($config->{'templates'}->{'dirlist_up'});
 

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

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


@@ -132,21 +135,23 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
 
   foreach my $dir(@$dirs)
   {

-   my $phys_path = $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;
    $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
 
 
    my @stat      = stat($phys_path);
 
    my $dtpl = new Template;
    $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
 

-   $dtpl->fillin("DIR",$virt_path);
-   $dtpl->fillin("DIR_NAME",$dir);
-   $dtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
-   $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
+   $dtpl->fillin('DIR',$virt_path);
+   $dtpl->fillin('DIR_NAME',encode_entities($dir));
+   $dtpl->fillin('DATE',encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
+   $dtpl->fillin('URL',equal_url(encode_entities($config->{'httproot'}),$virt_path));

 
 

-   $dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
-   $dtpl->parse_if_block("users",$users && -o $phys_path);
+   $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;
   }


@@ -155,7 +160,9 @@ 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 @stat      = stat($phys_path);
    my $virt_path = encode_entities($virtual.$file);
 
    my @stat      = stat($phys_path);


@@ -165,37 +172,41 @@ sub exec_show($$)
    my $ftpl = new Template;
    $ftpl->read_file($config->{'templates'}->{'dirlist_file'});
 
    my $ftpl = new Template;
    $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",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
-   $ftpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
+   $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'},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('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('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('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('too_large',$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});

 
 

-   $ftpl->parse_if_block("users",$users && -o $phys_path);
+   $ftpl->parse_if_block('users',$users && -o $phys_path);

 
    $dirlist .= $ftpl->get_template;
   }
 
   $tpl->read_file($config->{'templates'}->{'dirlist'});
 
 
    $dirlist .= $ftpl->get_template;
   }
 
   $tpl->read_file($config->{'templates'}->{'dirlist'});
 

-  $tpl->fillin("DIRLIST",$dirlist);
-  $tpl->fillin("DIR",$virtual);
-  $tpl->fillin("SCRIPT",$script);
-  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $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->parse_if_block("dir_writeable",$dir_writeable);
+  $tpl->fillin('FILTER',encode_entities($filter2));
+  $tpl->fillin('FILTER_URL',escape($filter2));
+
+  $tpl->parse_if_block('dir_writeable',$dir_writeable);
+  $tpl->parse_if_block('filter',$filter2);

  }
  else
  {
  }
  else
  {


@@ -204,43 +215,33 @@ sub exec_show($$)
   return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);
 
   # Check on binary files
   return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical);
 
   # 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'},$upper_path) unless(-T $physical);

 
 

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

 
 

-   if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
-   {
-    return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}})
-   }
-   else
-   {
-    my $content =  file_read($physical);
-    $$content   =~ s/\015\012|\012|\015/\n/g;
+  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'});

 
 

-    $tpl->read_file($config->{'templates'}->{'viewfile'});
+  # View the file

 
 

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

 
 

-    $tpl->parse_if_block("editable",-w $physical && $uselist->unused($virtual));
+  $tpl->read_file($config->{'templates'}->{'viewfile'});

 
 

-    $tpl->fillin("CONTENT",encode_entities($$content));
-   }
-  }
+  $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 && $uselist->unused($virtual));
+
+  $tpl->fillin('CONTENT',encode_entities($$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;


@@ -269,43 +270,35 @@ sub exec_beginedit($$)
 
  # Check on binary files
 
 
  # Check on binary files
 

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

 
 

-  return error($config->{'errors'}->{'binary'},$dir);
- }
- else
- {
-  if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
-  {
-   return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}})
-  }
-  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;
+ # Lock the file...

 
 

-   my $tpl = new Template;
-   $tpl->read_file($config->{'templates'}->{'editfile'});
+ $uselist->add_file($virtual);
+ $uselist->save;

 
 

-   $tpl->fillin("FILE",$virtual);
-   $tpl->fillin("DIR",$dir);
-   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-   $tpl->fillin("SCRIPT",$script);
-   $tpl->fillin("CONTENT",encode_entities($$content));
+ # ... and show the editing form

 
 

-   my $output = header(-type => "text/html");
-   $output   .= $tpl->get_template;
+ my $content =  file_read($physical);
+ $$content   =~ s/\015\012|\012|\015/\n/g;

 
 

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

 }
 
 # exec_canceledit()
 }
 
 # exec_canceledit()


@@ -419,10 +412,10 @@ sub exec_mkfile($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkfile'});
 
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkfile'});
 

-  $tpl->fillin("DIR","/");
-  $tpl->fillin("SCRIPT",$script);
+  $tpl->fillin('DIR','/');
+  $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;


@@ -446,10 +439,10 @@ 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($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
-

  if($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});
  }
   mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual});
   return devedit_reload({command => 'show', file => $dir});
  }


@@ -458,10 +451,10 @@ sub exec_mkdir($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkdir'});
 
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkdir'});
 

-  $tpl->fillin("DIR","/");
-  $tpl->fillin("SCRIPT",$script);
+  $tpl->fillin('DIR','/');
+  $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;


@@ -492,39 +485,41 @@ sub exec_upload($$)
   # Process file upload
 
   my $filename  = file_name($uploaded_file);
   # Process file upload
 
   my $filename  = file_name($uploaded_file);

-  my $file_phys = $physical."/".$filename;
+  my $file_phys = $physical.'/'.$filename;

   my $file_virt = $virtual.$filename;
 
   my $file_virt = $virtual.$filename;
 

-  return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));
+  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'}->{'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');
 
 
   my $ascii     = $cgi->param('ascii');
   my $handle    = $cgi->upload('uploaded_file');
 

-  local *FILE;
-
-  open(FILE,">".$file_phys) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
-  binmode(FILE) unless($ascii);
+  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
 
   # 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

-  print FILE $data;
+  file_save($file_phys,\$data,not $ascii) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});

 
 

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

  }
  else
  {
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'upload'});
 
  }
  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);
+  $tpl->fillin('DIR',$virtual);
+  $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;


@@ -548,8 +543,8 @@ sub exec_copy($$)
  my $dir            = upper_path($virtual);
  my $new_physical   = $data->{'new_physical'};
 
  my $dir            = upper_path($virtual);
  my $new_physical   = $data->{'new_physical'};
 

- return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);
- return error($config->{'errors'}->{'no_copy'},upper_path($virtual)) unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'},$dir) if(-d $physical);
+ return error($config->{'errors'}->{'no_copy'},$dir) unless(-r $physical);

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


@@ -559,28 +554,26 @@ sub exec_copy($$)
 
   if(-e $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'}->{'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'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical);

 
 

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

    {
     my $tpl = new Template;
     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 
    {
     my $tpl = new Template;
     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 

-    $tpl->fillin("FILE",$virtual);
-    $tpl->fillin("NEW_FILE",$new_virtual);
-    $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
-    $tpl->fillin("NEW_DIR",$new_dir);
-    $tpl->fillin("DIR",$dir);
+    $tpl->fillin('FILE',$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);
+    $tpl->fillin('COMMAND','copy');
+    $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;


@@ -595,12 +588,12 @@ sub exec_copy($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'copyfile'});
 
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'copyfile'});
 

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


@@ -624,8 +617,8 @@ sub exec_rename($$)
  my $dir            = upper_path($virtual);
  my $new_physical   = $data->{'new_physical'};
 
  my $dir            = upper_path($virtual);
  my $new_physical   = $data->{'new_physical'};
 

- return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
- return error($config->{'errors'}->{'no_rename'},$dir) unless(-w upper_path($physical));
+ return error($config->{'errors'}->{'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)
  return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
 
  if($new_physical)


@@ -636,28 +629,26 @@ sub exec_rename($$)
 
   if(-e $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'}->{'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'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical);

 
 

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

    {
     my $tpl = new Template;
     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 
    {
     my $tpl = new Template;
     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 

-    $tpl->fillin("FILE",$virtual);
-    $tpl->fillin("NEW_FILE",$new_virtual);
-    $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
-    $tpl->fillin("NEW_DIR",$new_dir);
-    $tpl->fillin("DIR",$dir);
+    $tpl->fillin('FILE',$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","rename");
-    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
-    $tpl->fillin("SCRIPT",$script);
+    $tpl->fillin('COMMAND','rename');
+    $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;


@@ -672,12 +663,12 @@ sub exec_rename($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'renamefile'});
 
   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);
+  $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;


@@ -700,7 +691,7 @@ sub exec_remove($$)
  my $virtual        = $data->{'virtual'};
  my $dir            = upper_path($virtual);
 
  my $virtual        = $data->{'virtual'};
  my $dir            = upper_path($virtual);
 

- return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'remove_root'},'/') if($virtual eq '/');

  return error($config->{'errors'}->{'no_delete'},$dir)  unless(-w upper_path($physical));
 
  if(-d $physical)
  return error($config->{'errors'}->{'no_delete'},$dir)  unless(-w upper_path($physical));
 
  if(-d $physical)


@@ -717,12 +708,12 @@ sub exec_remove($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
 
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
 

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


@@ -744,12 +735,12 @@ sub exec_remove($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
 
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
 

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


@@ -772,94 +763,73 @@ sub exec_chprop($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $dir            = upper_path($virtual);
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $dir            = upper_path($virtual);

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

 
 

- if($users)
- {
-  # System supports user and groups
+ 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));
+
+ my $cgi   = $data->{'cgi'};
+ my $mode  = $cgi->param('mode');
+ my $group = $cgi->param('group');

 
 

-  if($virtual ne "/")
+ if($mode || $group)
+ {
+  if($mode)

   {
   {

-   # Not the root directory
+   # Change the mode

 
 

-   if(-o $physical)
-   {
-    # We own this file
-
-    if($mode || $group)
-    {
-     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
-    {
-     # Display the form
-
-     my @stat = stat($physical);
-     my $mode = $stat[2];
-     my $gid  = $stat[5];
-
-     my $tpl = new Template;
-     $tpl->read_file($config->{'templates'}->{'chprop'});
-
-     # Insert file properties into the template
-
-     $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;
-    }
-   }
-   else
-   {
-    return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual});
-   }
+   chmod(oct($mode),$physical);

   }
   }

-  else
+
+  if($group)

   {
   {

-   return error($config->{'errors'}->{'chprop_root'},"/");
+   # 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
  {

-  return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual});
+  # Display the form
+
+  my @stat = stat($physical);
+  my $mode = $stat[2];
+  my $gid  = $stat[5];
+
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'chprop'});
+
+  # Insert file properties into the template
+
+  $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;

  }
 }
 
  }
 }
 


@@ -892,12 +862,12 @@ sub exec_unlock($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'confirm_unlock'});
 
   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);
+  $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;


@@ -920,33 +890,33 @@ sub exec_about($$)
  my $tpl = new Template;
  $tpl->read_file($config->{'templates'}->{'about'});
 
  my $tpl = new Template;
  $tpl->read_file($config->{'templates'}->{'about'});
 

- $tpl->fillin("SCRIPT",$script);
+ $tpl->fillin('SCRIPT',$script);

 
  # Dev-Editor's version number
 
 
  # Dev-Editor's version number
 

- $tpl->fillin("VERSION",$data->{'version'});
+ $tpl->fillin('VERSION',$data->{'version'});

 
  # Some path information
 
 
  # Some path information
 

- $tpl->fillin("SCRIPT_PHYS",encode_entities($ENV{'SCRIPT_FILENAME'}));
- $tpl->fillin("CONFIG_PATH",encode_entities($data->{'configfile'}));
- $tpl->fillin("FILE_ROOT",  encode_entities($config->{'fileroot'}));
- $tpl->fillin("HTTP_ROOT",  encode_entities($config->{'httproot'}));
+ $tpl->fillin('SCRIPT_PHYS',encode_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
 
 
  # Perl
 

- $tpl->fillin("PERL_PROG",encode_entities($^X));
- $tpl->fillin("PERL_VER",sprintf("%vd",$^V));
+ $tpl->fillin('PERL_PROG',encode_entities($^X));
+ $tpl->fillin('PERL_VER', sprintf('%vd',$^V));

 
  # Information about the server
 
 
  # Information about the server
 

- $tpl->fillin("HTTPD",encode_entities($ENV{'SERVER_SOFTWARE'}));
- $tpl->fillin("OS",$^O);
- $tpl->fillin("TIME",encode_entities(strftime($config->{'timeformat'},localtime)));
+ $tpl->fillin('HTTPD',encode_entities($ENV{'SERVER_SOFTWARE'}));
+ $tpl->fillin('OS',   encode_entities($^O));
+ $tpl->fillin('TIME', encode_entities(strftime($config->{'timeformat'},localtime)));

 
  # Process information
 
 
  # Process information
 

- $tpl->fillin("PID",$$);
+ $tpl->fillin('PID',$$);

 
  # Check if the functions getpwuid() and getgrgid() are available
 
 
  # Check if the functions getpwuid() and getgrgid() are available
 


@@ -958,45 +928,45 @@ sub exec_about($$)
   my $uid = POSIX::getuid;
   my $gid = POSIX::getgid;
 
   my $uid = POSIX::getuid;
   my $gid = POSIX::getgid;
 

-  $tpl->parse_if_block("users",1);
+  $tpl->parse_if_block('users',1);

 
   # ID's of user and group
 
 
   # ID's of user and group
 

-  $tpl->fillin("UID",$uid);
-  $tpl->fillin("GID",$gid);
+  $tpl->fillin('UID',$uid);
+  $tpl->fillin('GID',$gid);

 
   # Names of user and group
 
   if(my $user = getpwuid($uid))
   {
 
   # Names of user and group
 
   if(my $user = getpwuid($uid))
   {

-   $tpl->fillin("USER",encode_entities($user));
-   $tpl->parse_if_block("user_detected",1);
+   $tpl->fillin('USER',encode_entities($user));
+   $tpl->parse_if_block('user_detected',1);

   }
   else
   {
   }
   else
   {

-   $tpl->parse_if_block("user_detected",0);
+   $tpl->parse_if_block('user_detected',0);

   }
 
   if(my $group = getgrgid($gid))
   {
   }
 
   if(my $group = getgrgid($gid))
   {

-   $tpl->fillin("GROUP",encode_entities($group));
-   $tpl->parse_if_block("group_detected",1);
+   $tpl->fillin('GROUP',encode_entities($group));
+   $tpl->parse_if_block('group_detected',1);

   }
   else
   {
   }
   else
   {

-   $tpl->parse_if_block("group_detected",0);
+   $tpl->parse_if_block('group_detected',0);

   }
 
   # Process umask
 
   }
 
   # Process umask
 

-  $tpl->fillin("UMASK",sprintf("%04o",umask));
+  $tpl->fillin('UMASK',sprintf('%04o',umask));

  }
  else
  {
  }
  else
  {

-  $tpl->parse_if_block("users",0);
+  $tpl->parse_if_block('users',0);

  }
 
  }
 

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

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