Some cleanings...

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 0a368e95db7777ef68bad27dbe2330a3f8c62029..4a5e7681b6ca4a42a8c72705897f96c8c52cb517 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,38 +6,64 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2003-11-10
+# Last modified: 2004-02-20

 #
 
 use strict;
 
 #
 
 use strict;
 

-use vars qw(@EXPORT
-            $script);
+use vars qw(@EXPORT);

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

+use File::Path;

 
 

-use HTML::Entities;
-use Output;

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

-$script = $ENV{'SCRIPT_NAME'};
+use CGI qw(header);
+use HTML::Entities;
+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,
+                'copy'       => \&exec_copy,
+                'rename'     => \&exec_rename,
+                'remove'     => \&exec_remove,
+                'unlock'     => \&exec_unlock
+               );

 
 ### Export ###
 
 use base qw(Exporter);
 
 
 ### Export ###
 
 use base qw(Exporter);
 

-@EXPORT = qw(exec_show
-             exec_beginedit
-             exec_endedit
-             exec_mkfile
-             exec_mkdir
-             exec_workwithfile
-             exec_copy
-             exec_rename
-             exec_remove
-             exec_unlock);
+@EXPORT = qw(exec_command);
+
+# exec_command()
+#
+# Execute the specified command
+#
+# Params: 1. Command to execute
+#         2. Reference to user input hash
+#         3. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_command($$$)
+{
+ my ($command,$data,$config) = @_;
+
+ return error("Unknown command: $command") unless($dispatch{$command});
+
+ my $output = &{$dispatch{$command}}($data,$config);
+ return $output;
+}

 
 # exec_show()
 #
 
 # exec_show()
 #


@@ -48,62 +74,57 @@ use base qw(Exporter);
 #
 # Return: Output of the command (Scalar Reference)
 
 #
 # Return: Output of the command (Scalar Reference)
 

-sub exec_show($$$)
+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 $tpl = new Template;

 
  if(-d $physical)
  {
   # Create directory listing
 
   my $direntries = dir_read($physical);
 
  if(-d $physical)
  {
   # Create directory listing
 
   my $direntries = dir_read($physical);

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

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

-  $output .= htmlhead("Directory listing of $virtual");
-  $output .= equal_url($config->{'httproot'},$virtual);
-  $output .= "<hr>\n\n<pre>\n";
+  my $dirlist = "";

 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 
   unless($virtual eq "/")
   {
 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 
   unless($virtual eq "/")
   {

-   my $upper = $physical."/..";
-   my @stat  = stat($upper);
-
-   $output .= "  [SUBDIR]  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "<a href=\"$script?command=show&file=".encode_entities(upper_path($virtual))."\">../</a>\n";
-  }
+   my @stat  = stat($physical."/..");

 
 

-  # Get the length of the longest file/directory name
+   my $udtpl = new Template;
+   $udtpl->read_file($config->{'tpl_dirlist_up'});

 
 

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

 
 

-  foreach(@$dirs,@$files)
-  {
-   my $length    = length($_);
-   $max_name_len = $length if($length > $max_name_len);
+   $dirlist .= $udtpl->get_template;

   }
 
   # Directories
 
   foreach my $dir(@$dirs)
   {
   }
 
   # Directories
 
   foreach my $dir(@$dirs)
   {

-   my @stat = stat($physical."/".$dir);
+   my @stat      = stat($physical."/".$dir);
+   my $virt_path = encode_entities($virtual.$dir."/");
+
+   my $dtpl = new Template;
+   $dtpl->read_file($config->{'tpl_dirlist_dir'});

 
 

-   $output .= "  ";
-   $output .= "[SUBDIR]  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "<a href=\"$script?command=show&file=".encode_entities($virtual.$dir)."/\">".encode_entities($dir)."/</a>\n";
+   $dtpl->fillin("DIR",$virt_path);
+   $dtpl->fillin("DIR_NAME",$dir);
+   $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+
+   $dirlist .= $dtpl->get_template;

   }
 
   # Files
   }
 
   # Files


@@ -116,89 +137,40 @@ sub exec_show($$$)
    my @stat      = stat($phys_path);
    my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
 
    my @stat      = stat($phys_path);
    my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
 

-   $output .= " " x (10 - length($stat[7]));
-   $output .= $stat[7];
-   $output .= "  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= encode_entities($file);
-   $output .= " " x ($max_name_len - length($file))."\t  (";
+   my $ftpl = new Template;
+   $ftpl->read_file($config->{'tpl_dirlist_file'});

 
 

-   # Link "View"
+   $ftpl->fillin("FILE",$virt_path);
+   $ftpl->fillin("FILE_NAME",$file);
+   $ftpl->fillin("SIZE",$stat[7]);
+   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));

 
 

-   if(-r $phys_path && -T $phys_path)
-   {
-    $output .= "<a href=\"$script?command=show&file=$virt_path\">View</a>";
-   }
-   else
-   {
-    $output .= '<span style="color:#C0C0C0" title="';
-
-    $output .= (not -r $phys_path) ? "Not readable" :
-               (-B     $phys_path) ? "Binary file"  : "";
-
-    $output .= '">View</span>';
-   }
+   $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);

 
 

-   $output .= " | ";
-
-   # Link "Edit"
-
-   if(-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
-   {
-    $output .= "<a href=\"$script?command=beginedit&file=$virt_path\">Edit</a>";
-   }
-   else
-   {
-    $output .= '<span style="color:#C0C0C0" title="';
+   $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);

 
 

-    $output .= (not -r $phys_path) ? "Not readable" :
-               (not -w $phys_path) ? "Read only"    :
-               (-B     $phys_path) ? "Binary file"  :
-               ($in_use)           ? "In use"       : "";
+   $ftpl->parse_if_block("in_use",$in_use);
+   $ftpl->parse_if_block("unused",not $in_use);

 
 

-    $output .= '">Edit</span>';
-   }
+   $dirlist .= $ftpl->get_template;
+  }

 
 

-   # Link "Do other stuff"

 
 

-   $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Do other stuff</a>)\n";
-  }
+  $tpl->read_file($config->{'tpl_dirlist'});

 
 

-  $output .= "</pre>\n\n<hr>\n\n";
-
-  # Bottom of directory listing
-  # (Fields for creating files and directories)
-
-  $output .= <<END;
-<table border="0">
-<tr>
-<form action="$script">
-<input type="hidden" name="command" value="mkdir">
-<input type="hidden" name="curdir" value="$virtual">
-<td>Create new directory:</td>
-<td>$virtual <input type="text" name="newfile"> <input type="submit" value="Create!"></td>
-</form>
-</tr>
-<tr>
-<td>Create new file:</td>
-<form action="$script">
-<input type="hidden" name="command" value="mkfile">
-<input type="hidden" name="curdir" value="$virtual">
-<td>$virtual <input type="text" name="newfile"> <input type="submit" value="Create!"></td>
-</form>
-</tr>
-</table>
-
-<hr>
-END
-  $output .= htmlfoot;
+  $tpl->fillin("DIRLIST",$dirlist);
+  $tpl->fillin("DIR",$virtual);
+  $tpl->fillin("SCRIPT",$script);
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));

  }
  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->{'err_noview'},upper_path($virtual)) unless(-r $physical);

 
   # Check on binary files
   # We have to do it in this way, or empty files
 
   # Check on binary files
   # We have to do it in this way, or empty files


@@ -208,25 +180,27 @@ END
   {
    # Binary file
 
   {
    # Binary file
 

-   return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+   return error($config->{'err_binary'},upper_path($virtual));

   }
   else
   {
    # Text file
 
   }
   else
   {
    # Text file
 

-   $output  = htmlhead("Contents of file ".encode_entities($virtual));
-   $output .= equal_url($config->{'httproot'},$virtual);
-   $output .= dir_link($virtual);
+   my $content = file_read($physical);

 
 

-   $output .= '<div style="background-color:#FFFFE0;border:1px solid black;margin-top:10px;width:100%">'."\n";
-   $output .= '<pre style="color:#0000C0;">'."\n";
-   $output .= encode_entities(${file_read($physical)});
-   $output .= "\n</pre>\n</div>";
+   $tpl->read_file($config->{'tpl_viewfile'});

 
 

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

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


@@ -246,9 +220,9 @@ sub exec_beginedit($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 

- return error("You cannot edit directories.",upper_path($virtual)) if(-d $physical);
+ return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);

  return error_in_use($virtual) if($uselist->in_use($virtual));
  return error_in_use($virtual) if($uselist->in_use($virtual));

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

 
  # Check on binary files
 
 
  # Check on binary files
 


@@ -256,7 +230,7 @@ sub exec_beginedit($$)
  {
   # Binary file
 
  {
   # Binary file
 

-  return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+  return error($config->{'err_binary'},upper_path($virtual));

  }
  else
  {
  }
  else
  {


@@ -265,49 +239,41 @@ sub exec_beginedit($$)
   $uselist->add_file($virtual);
   $uselist->save;
 
   $uselist->add_file($virtual);
   $uselist->save;
 

-  my $dir       = upper_path($virtual);
-  my $content   = encode_entities(${file_read($physical)});
-
-  my $equal_url = equal_url($config->{'httproot'},$virtual);
+  my $content = file_read($physical);

 
 

-  $virtual   = encode_entities($virtual);
+  my $tpl = new Template;
+  $tpl->read_file($config->{'tpl_editfile'});

 
 

-  my $output = htmlhead("Edit file $virtual");
-  $output   .= $equal_url;
-  $output   .= <<END;
-<p><b style="color:#FF0000">Caution!</b> This file is locked for other users while you are editing it. To unlock it, click <i>Save and exit</i> or <i>Exit WITHOUT saving</i>. Please <b>don't</b> click the <i>Reload</i> button in your browser! This will confuse the editor.</p>
+  $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));

 
 

-<form action="$script" method="get">
-<input type="hidden" name="command" value="canceledit">
-<input type="hidden" name="file" value="$virtual">
-<p><input type="submit" value="Exit WITHOUT saving"></p>
-</form>
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;

 
 

-<form action="$script" method="post">
-<input type="hidden" name="command" value="endedit">
-<input type="hidden" name="file" value="$virtual">
-
-<table width="100%" border="1">
-<tr>
-<td width="50%" align="center">
-<input type="hidden" name="file" value="$virtual">
-<input type="checkbox" name="saveas" value="1"> Save as new file: $dir <input type=text name="newfile" value=""></td>
-<td width="50%" align="center"><input type="checkbox" name="encode_iso" value="1"> Encode ISO-8859-1 special chars</td>
-</tr>
-<tr>
-<td align="center"><input type="reset" value="Reset form"></td>
-<td align="center"><input type="submit" value="Save and exit"></td>
-</tr>
-</table>
+  return \$output;
+ }
+}

 
 

-<textarea name="filecontent" rows="25" cols="120">$content</textarea>
-</form>
-END
+# exec_canceledit()
+#
+# Abort file editing
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)

 
 

-  $output .= htmlfoot;
+sub exec_canceledit($$)
+{
+ my ($data,$config) = @_;
+ my $virtual        = $data->{'virtual'};
+ my $uselist        = $data->{'uselist'};

 
 

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

 }
 
 # exec_endedit()
 }
 
 # exec_endedit()


@@ -326,8 +292,8 @@ sub exec_endedit($$)
  my $virtual        = $data->{'virtual'};
  my $content        = $data->{'cgi'}->param('filecontent');
 
  my $virtual        = $data->{'virtual'};
  my $content        = $data->{'cgi'}->param('filecontent');
 

- return error("You cannot edit directories.") if(-d $physical);
- return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical);
+ return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
+ return error($config->{'err_noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical);

 
  # Normalize newlines
 
 
  # Normalize newlines
 


@@ -352,11 +318,12 @@ sub exec_endedit($$)
  {
   # Saving of the file was successful - so unlock it!
 
  {
   # Saving of the file was successful - so unlock it!
 

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

  }
  else
  {
  }
  else
  {

-  return error("Saving of file '".encode_entities($virtual)."' failed'.",upper_path($virtual));
+  return error($config->{'err_editfailed'},upper_path($virtual),{FILE => $virtual});

  }
 }
 
  }
 }
 


@@ -402,136 +369,85 @@ sub exec_mkdir($$)
 
  return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
 
 
  return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
 

- mkdir($new_physical) or return error("Could not create directory '$new_virtual'.",$dir);
+ 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 => $dir});
 }
 

-# exec_workwithfile()
+# exec_copy()

 #
 #

-# Display a form for renaming/copying/deleting/unlocking a file
+# Copy a file 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_workwithfile($$)
+sub exec_copy($$)

 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};

- my $virtual        = $data->{'virtual'};
- my $unused         = $data->{'uselist'}->unused($virtual);
-
- my $dir = encode_entities(upper_path($virtual));
-
- my $output = htmlhead("Work with file ".encode_entities($virtual));
- $output   .= equal_url($config->{'httproot'},$virtual);
-
- $virtual   = encode_entities($virtual);
-
- $output   .= dir_link($virtual);
- $output   .= "<p><b>Note:</b> On UNIX systems, filenames are <b>case-sensitive</b>!</p>\n\n";
-
- $output .= "<p>Someone else is currently editing this file. So not all features are available.</p>\n\n" unless($unused);
-
- $output .= "<hr>\n\n";
-
- # Copying of the file is always allowed - but we need read access
-
- if(-r $physical)
- {
-  $output .= <<END;
-<h2>Copy</h2>
-
-<form action="$script">
-<input type="hidden" name="command" value="copy">
-<input type="hidden" name="file" value="$virtual">
-<p>Copy file '$virtual' to: $dir <input type="text" name="newfile" size="50"> <input type="submit" value="Copy!"></p>
-</form>
+ my $virtual        = encode_entities($data->{'virtual'});
+ my $new_physical   = $data->{'new_physical'};

 
 

-<hr>
+ return error($config->{'err_dircopy'}) if(-d $physical);
+ return error($config->{'err_nocopy'})  unless(-r $physical);

 
 

-END
- }
-
- if($unused)
+ if($new_physical)

  {
  {

-  # File is not locked
-  # Allow renaming and deleting the file
-
-  $output .= <<END;
-<h2>Move/rename</h2>
+  my $new_virtual = $data->{'new_virtual'};
+  my $dir         = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);

 
 

-<form action="$script">
-<input type="hidden" name="command" value="rename">
-<input type="hidden" name="file" value="$virtual">
-<p>Move/Rename file '$virtual' to: $dir <input type="text" name="newfile" size="50"> <input type="submit" value="Move/Rename!"></p>
-</form>
-
-<hr>
+  if(-e $new_physical)
+  {
+   if(-d $new_physical)
+   {
+    return error("A directory called '$new_virtual' already exists. You cannot replace a directory by a file!",$dir);
+   }
+   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;
+   }
+  }

 
 

-<h2>Delete</h2>
+  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);
+  }

 
 

-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="remove">
-<p><input type="submit" value="Delete file '$virtual'!"></p>
-</form>
-END
+  copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
+  return devedit_reload({command => 'show', file => $dir});

  }
  else
  {
  }
  else
  {

-  # File is locked
-  # Just display a button for unlocking it
-
-  $output .= <<END;
-<h2>Unlock file</h2>
+  my $tpl = new Template;
+  $tpl->read_file($config->{'tpl_copyfile'});

 
 

-<p>Someone else is currently editing this file. At least, the file is marked so. Maybe, someone who was editing the file has forgotten to unlock it. In this case (and <b>only</b> in this case) you can unlock the file using this button:</p>
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($virtual));
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);

 
 

-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="unlock">
-<p><input type="submit" value="Unlock file '$virtual'"></p>
-</form>
-END
- }
-
- $output .= "\n<hr>";
- $output .= htmlfoot;
-
- return \$output;
-}
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;

 
 

-# exec_copy()
-#
-# Copy a file and return to directory view
-#
-# Params: 1. Reference to user input hash
-#         2. Reference to config hash
-#
-# Return: Output of the command (Scalar Reference)
-
-sub exec_copy($$)
-{
- my ($data,$config) = @_;
- my $physical       = $data->{'physical'};
- my $virtual        = encode_entities($data->{'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);
-
- 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);
-
- if(-e $new_physical)
- {
-  return error("A file or directory called '$new_virtual' already exists and this editor is currently not able to ask to overwrite the existing file or directory.",upper_path($virtual));
+  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()


@@ -555,18 +471,67 @@ sub exec_rename($$)
 
  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
 
 
  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
 

- if(-e $new_physical)
+ if($new_physical)

  {
  {

-  return error("A file or directory called '$new_virtual' already exists and this editor is currently not able to ask to overwrite the existing file or directory.",upper_path($virtual));
+  my $new_virtual = $data->{'new_virtual'};
+  my $dir         = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);
+
+  if(-e $new_physical)
+  {
+   if(-d $new_physical)
+   {
+    return error("A directory called '$new_virtual' already exists. You cannot replace a directory by a file!",$dir);
+   }
+   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","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);
+  }
+
+  rename($physical,$new_physical) or return error("Could not move/rename '$virtual' to '$new_virtual'",upper_path($virtual));
+  return devedit_reload({command => 'show', file => $dir});

  }
  }

+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'tpl_renamefile'});

 
 

- 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});
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($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_remove()
 #
 }
 
 # exec_remove()
 #

-# Remove a file 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
 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash


@@ -579,11 +544,58 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 

- return error("Deleting directories is currently unsupported.",upper_path($virtual)) if(-d $physical);
- return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
+ if(-d $physical)
+ {
+  # Remove a directory

 
 

- unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual));
- return devedit_reload({command => 'show', file => upper_path($virtual)});
+  if($data->{'cgi'}->param('confirmed'))
+  {
+   rmtree($physical);
+   return devedit_reload({command => 'show', file => upper_path($virtual)});
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'tpl_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);
+
+   my $output = header(-type => "text/html");
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+ }
+ else
+ {
+  # Remove a file
+
+  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
+
+  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)});
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'tpl_confirm_rmfile'});
+
+   $tpl->fillin("FILE",$virtual);
+   $tpl->fillin("DIR",upper_path($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_unlock()
 }
 
 # exec_unlock()


@@ -602,10 +614,26 @@ sub exec_unlock($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 

- $uselist->remove_file($virtual);
- $uselist->save;
+ if($data->{'cgi'}->param('confirmed'))
+ {
+  file_unlock($uselist,$virtual);
+  return devedit_reload({command => 'show', file => upper_path($virtual)});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'tpl_confirm_unlock'});
+
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($virtual));
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);

 
 

- return devedit_reload({command => 'show', file => upper_path($virtual)});
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

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