Ooops...?

What was that?

Something definitely went wrong when I remade the copy and the rename functions.
They printed a wrong error message if the destination already existed and if it
was a file.
Dev-Editor also didn't deny copying a directory.

diff --git a/errors.dat b/errors.dat
index 60088f1438332ce462f6ad1572cef659bd3a8db9..338dbfe0a7fbac3bfc180f38fa06f814dd99c980 100644 (file)
--- a/errors.dat
+++ b/errors.dat
@@ -16,6 +16,7 @@ create_ar      = You aren't allowed to create files and directories above the vi
 file_exists    = A file or directory called '{FILE}' already exists.
 exist_edited   = The target file '{FILE}' already exists and is edited by someone else.
 in_use         = The file '{FILE}' is currently edited by someone else.
+dir_replace    = You are not allowed to replace a directory.
 noview         = You have not enough permissions to view this file.
 nocopy         = You have not enough permissions to copy this file.
 dircopy        = This editor is not able to copy directories.

diff --git a/modules/Command.pm b/modules/Command.pm
index 46798eec4236b7f521959e39ff4185ddc554efe0..967615d97448c338b2ef8a1e7e9fc3ab3280ab06 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-08-29
+# Last modified: 2004-09-05
 #
 
 use strict;
@@ -528,7 +528,8 @@ sub exec_copy($$)
  my $virtual        = encode_entities($data->{'virtual'});
  my $new_physical   = $data->{'new_physical'};
 
- return error($config->{'errors'}->{'nocopy'}) unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'}) if(-d $physical);
+ return error($config->{'errors'}->{'nocopy'})  unless(-r $physical);
 
  if($new_physical)
  {
@@ -542,7 +543,7 @@ sub exec_copy($$)
 
    if(-d $new_physical)
    {
-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {
@@ -617,7 +618,7 @@ sub exec_rename($$)
 
    if(-d $new_physical)
    {
-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {