- Added devedit_reload() to easily reload Dev-Editor with different arguments

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 1bd11164d8ba63acd64e9afc2a5134e42c217440..4e64a3651f777033a85298b83f30cc1acdccb6f9 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: 2003-10-20
+# Last modified: 2003-10-27
 #
 
 use strict;
@@ -14,8 +14,6 @@ use strict;
 use vars qw(@EXPORT
             $script);
 
-use CGI qw(redirect);
-
 use File::Access;
 use File::Copy;
 
@@ -354,9 +352,7 @@ sub exec_mkfile($$)
  return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
 
  file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir);
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_mkdir()
@@ -379,9 +375,7 @@ sub exec_mkdir($$)
  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);
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_workwithfile()
@@ -412,11 +406,13 @@ sub exec_workwithfile($$)
 
  $output .= "<p>Someone else is currently editing this file. So not all features are available.</p>\n\n" unless($unused);
 
- # Copying of the file as always allowed
+ $output .= "<hr>\n\n";
 
- $output .= <<END;
-<hr>
+ # Copying of the file is always allowed - but we need read access
 
+ if(-r $physical)
+ {
+  $output .= <<END;
 <h2>Copy</h2>
 
 <form action="$script">
@@ -428,6 +424,7 @@ sub exec_workwithfile($$)
 <hr>
 
 END
+ }
 
  if($unused)
  {
@@ -498,6 +495,7 @@ sub exec_copy($$)
  $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)
  {
@@ -505,9 +503,7 @@ sub exec_copy($$)
  }
 
  copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_rename()
@@ -537,9 +533,7 @@ sub exec_rename($$)
  }
 
  rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual));
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_remove()
@@ -561,9 +555,7 @@ sub exec_remove($$)
  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));
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual));
- return \$output;
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
 }
 
 # exec_unlock()
@@ -585,8 +577,7 @@ sub exec_unlock($$)
  $uselist->remove_file($virtual);
  $uselist->save;
 
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual));
- return \$output;
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
 }
 
 # it's true, baby ;-)