- Removed error message "file_in_use"

- Synchronized exec_mkfile() and exec_mkdir() in Command.pm

diff --git a/errors.dat b/errors.dat
index 81e7b5ef046514d965332590872342068c2f4731..88be554d19c0b9d1fbe17d41ada7dc0957e02827 100644 (file)
--- a/errors.dat
+++ b/errors.dat
@@ -17,7 +17,6 @@ editdir        = You cannot edit directories.
 exist_edited   = The target file '{FILE}' already exists and is edited by someone else.
 exist_no_write = The target file '{FILE}' already exists and you have not enough permissions to replace it.
 file_exists    = A file or directory called '{FILE}' already exists.
 exist_edited   = The target file '{FILE}' already exists and is edited by someone else.
 exist_no_write = The target file '{FILE}' already exists and you have not enough permissions to replace it.
 file_exists    = A file or directory called '{FILE}' already exists.

-file_in_use    = The file '{FILE}' is currently edited by someone else.

 file_too_large = The file you want to view or edit is too large (max. {SIZE} Bytes).
 in_use         = The file '{FILE}' is currently edited by someone else.
 invalid_group  = '{GROUP}' seems to be an invalid group name. Please check it and try again.
 file_too_large = The file you want to view or edit is too large (max. {SIZE} Bytes).
 in_use         = The file '{FILE}' is currently edited by someone else.
 invalid_group  = '{GROUP}' seems to be an invalid group name. Please check it and try again.

diff --git a/modules/Command.pm b/modules/Command.pm
index 96dbf5273a42285c454eab6b30db2db362b440cc..d6df6b2f4fb0dd77e1e042fd8840e882772e4316 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: 2005-01-01
+# Last modified: 2005-01-05

 #
 
 use strict;
 #
 
 use strict;


@@ -439,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});
  }