- Removed error message "file_in_use"

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 0b39533af424012dd0f4ac1bb23d8f580cac65c4..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: 2004-12-28
+# 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});
  }


@@ -500,6 +500,8 @@ sub exec_upload($$)
   my $ascii     = $cgi->param('ascii');
   my $handle    = $cgi->upload('uploaded_file');
 
   my $ascii     = $cgi->param('ascii');
   my $handle    = $cgi->upload('uploaded_file');
 

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

   # Read transferred file and write it to disk
 
   read($handle, my $data, -s $handle);
   # Read transferred file and write it to disk
 
   read($handle, my $data, -s $handle);