Dev-Editor 1.2

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 1718982ccacae4d531311ce0a9e05a6b41017087..ceee24d2ed11fe0e06f917829c4ba99615436b1c 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>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2003-12-18
+# Last modified: 2003-12-22

 #
 
 use strict;
 #
 
 use strict;


@@ -566,7 +566,7 @@ sub exec_workwithdir($$)
 <form action="$script">
 <input type="hidden" name="command" value="rename">
 <input type="hidden" name="file" value="$virtual">
 <form action="$script">
 <input type="hidden" name="command" value="rename">
 <input type="hidden" name="file" value="$virtual">

-<p>Move/Rename directory '$virtual' to: $dir <input type="text" name="newfile" size="50"> <input type="submit" value="Move/Rename!"></p>
+<p>Move/Rename directory '$virtual' to:<br>$dir <input type="text" name="newfile" size="30"> <input type="submit" value="Move/Rename!"></p>

 </form>
 
 <hr>
 </form>
 
 <hr>


@@ -679,7 +679,44 @@ sub exec_rename($$)
 
  if(-e $new_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));
+  if(-d $new_physical)
+  {
+   return error("A directory called '$new_virtual' already exists. You cannot replace a directory!",upper_path($virtual));
+  }
+  elsif(not $data->{'cgi'}->param('confirmed'))
+  {
+   $dir = encode_entities($dir);
+
+   my $output = htmlhead("Replace existing file");
+   $output   .= <<"END";
+<p>A file called '$new_virtual' already exists. Do you want to replace it?</p>
+
+<form action="$script" method="get">
+<input type="hidden" name="command" value="rename">
+<input type="hidden" name="file" value="$virtual">
+<input type="hidden" name="newfile" value="$new_virtual">
+<input type="hidden" name="confirmed" value="1">
+
+<p><input type="submit" value="Yes"></p>
+</form>
+
+<form action="$script" method="get">
+<input type="hidden" name="command" value="show">
+<input type="hidden" name="file" value="$dir">
+
+<p><input type="submit" value="No"></p>
+</form>
+END
+
+   $output .= htmlfoot;
+
+   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 '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual));
  }
 
  rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual));


@@ -704,8 +741,46 @@ sub exec_remove($$)
  return exec_rmdir($data,$config) if(-d $physical);
  return error_in_use($virtual)    if($data->{'uselist'}->in_use($virtual));
 
  return exec_rmdir($data,$config) if(-d $physical);
  return error_in_use($virtual)    if($data->{'uselist'}->in_use($virtual));
 

- 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'))
+ {
+  unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual));
+  return devedit_reload({command => 'show', file => upper_path($virtual)});
+ }
+ else
+ {
+  my $dir = encode_entities(upper_path($virtual));
+  my $output;
+
+  $output  = htmlhead("Remove file ".encode_entities($virtual));
+  $output .= equal_url($config->{'httproot'},$virtual);
+
+  $virtual = encode_entities($virtual);
+
+  $output .= dir_link($virtual);
+
+  $output .= <<"END";
+<p>Do you really want to remove the file '$virtual'?</p>
+
+<form action="$script" method="get">
+<input type="hidden" name="command" value="remove">
+<input type="hidden" name="file" value="$virtual">
+<input type="hidden" name="confirmed" value="1">
+
+<p><input type="submit" value="Yes"></p>
+</form>
+
+<form action="$script" method="get">
+<input type="hidden" name="command" value="show">
+<input type="hidden" name="file" value="$dir">
+
+<p><input type="submit" value="No"></p>
+</form>
+END
+
+  $output .= htmlfoot;
+
+  return \$output;
+ }

 }
 
 # exec_rmdir()
 }
 
 # exec_rmdir()


@@ -735,7 +810,7 @@ sub exec_rmdir($$)
   my $dir = encode_entities(upper_path($virtual));
   my $output;
 
   my $dir = encode_entities(upper_path($virtual));
   my $output;
 

-  $output  = htmlhead("Remove directory $virtual");
+  $output  = htmlhead("Remove directory ".encode_entities($virtual));

   $output .= equal_url($config->{'httproot'},$virtual);
 
   $virtual = encode_entities($virtual);
   $output .= equal_url($config->{'httproot'},$virtual);
 
   $virtual = encode_entities($virtual);