X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/3e6b9e338fe5ea06b487202fe54217f2082cd13d..6a0845bb6cf36d03e039e3fd44180a21e8042f83:/modules/Command.pm?ds=inline diff --git a/modules/Command.pm b/modules/Command.pm index 1a39d67..44419ba 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 09-22-2003 +# Last modified: 2003-10-30 # use strict; @@ -14,9 +14,6 @@ use strict; use vars qw(@EXPORT $script); -use CGI qw(header - redirect); - use File::Access; use File::Copy; @@ -63,14 +60,14 @@ sub exec_show($$$) # Create directory listing my $direntries = dir_read($physical); - return error("Reading of directory $virtual failed") unless($direntries); + return error("Reading of directory $virtual failed.",upper_path($virtual)) unless($direntries); my $files = $direntries->{'files'}; my $dirs = $direntries->{'dirs'}; $output .= htmlhead("Directory listing of $virtual"); $output .= equal_url($config->{'httproot'},$virtual); - $output .= "
\n\n
\n";
+  $output .= "
\n\n
\n";
 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
@@ -83,10 +80,10 @@ sub exec_show($$$)
    $output .= "  [SUBDIR]  ";
    $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
    $output .= " " x 10;
-   $output .= "../\n";
+   $output .= "../\n";
   }
 
-  # Get the longest file/directory name
+  # Get the length of the longest file/directory name
 
   my $max_name_len = 0;
 
@@ -104,45 +101,64 @@ sub exec_show($$$)
 
    $output .= "  ";
    $output .= "[SUBDIR]  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
+   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
    $output .= " " x 10;
-   $output .= "".encode_entities($dir)."/\n";
+   $output .= "".encode_entities($dir)."/\n";
   }
 
   # Files
 
   foreach my $file(@$files)
   {
-   my @stat      = stat($physical."/".$file);
-   my $virt_path = $virtual.$file;
+   my $phys_path = $physical."/".$file;
+   my $virt_path = encode_entities($virtual.$file);
+
+   my @stat      = stat($phys_path);
    my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
 
    $output .= " " x (10 - length($stat[7]));
    $output .= $stat[7];
    $output .= "  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
-   $output .= ($in_use) ? " (IN USE) " : " " x 10;
+   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
+   $output .= ($in_use) ? " (IN USE) " : (not -T $phys_path) ? " (BINARY) " : " " x 10;
    $output .= encode_entities($file);
    $output .= " " x ($max_name_len - length($file))."\t  (";
-   $output .= "View | ";
 
-   $output .= ($in_use)
-              ? 'Edit'
-              : "Edit";
+   $output .= (-r $phys_path && -T $phys_path)
+              ? "View"
+              : 'View';
+
+   $output .= " | ";
+
+   $output .= (-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
+              ? "Edit"
+              : 'Edit';
 
    $output .= " | Do other stuff)\n";
   }
 
   $output .= "
\n\n
\n\n";
+
+  # Bottom of directory listing
+  # (Fields for creating files and directories)
+
   $output .= <
 
+

+
+
 Create new directory:
-$virtual  
+$virtual  
+

 
 
 Create new file:
-$virtual  
+

+
+
+$virtual  
+

 
 
 
@@ -154,19 +170,23 @@ END
  {
   # View a file
 
+  return error("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical);
+
   # Check on binary files
+  # We have to do it in this way, or empty files
+  # will be recognized as binary files
 
-  if(-B $physical)
+  unless(-T $physical)
   {
    # Binary file
 
-   return error("This editor is not able to view/edit binary files.");
+   return error("This editor is not able to view/edit binary files.",upper_path($virtual));
   }
   else
   {
    # Text file
 
-   $output  = htmlhead("Contents of file $virtual");
+   $output  = htmlhead("Contents of file ".encode_entities($virtual));
    $output .= equal_url($config->{'httproot'},$virtual);
    $output .= dir_link($virtual);
 
@@ -179,7 +199,7 @@ END
   }
  }
 
- return \$output
+ return \$output;
 }
 
 # exec_beginedit
@@ -198,16 +218,17 @@ sub exec_beginedit($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
- return error("You cannot edit directories.") if(-d $physical);
+ return error("You cannot edit directories.",upper_path($virtual)) if(-d $physical);
  return error_in_use($virtual) if($uselist->in_use($virtual));
+ return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical);
 
  # Check on binary files
 
- if(-B $physical)
+ unless(-T $physical)
  {
   # Binary file
 
-  return error("This editor is not able to view/edit binary files.");
+  return error("This editor is not able to view/edit binary files.",upper_path($virtual));
  }
  else
  {
@@ -216,27 +237,33 @@ sub exec_beginedit($$)
   $uselist->add_file($virtual);
   $uselist->save;
 
-  my $dir     = upper_path($virtual);
-  my $content = encode_entities(${file_read($physical)});
+  my $dir       = upper_path($virtual);
+  my $content   = encode_entities(${file_read($physical)});
+
+  my $equal_url = equal_url($config->{'httproot'},$virtual);
+
+  $virtual   = encode_entities($virtual);
 
   my $output = htmlhead("Edit file $virtual");
-  $output   .= equal_url($config->{'httproot'},$virtual);
+  $output   .= $equal_url;
   $output   .= <Caution! This file is locked for other users while you are editing it. To unlock it, click Save and exit or Exit WITHOUT saving. Please don't click the Reload button in your browser! This will confuse the editor.

 
-

+
 
 
 

 

 
-

+
 
 
 
 
-
+
@@ -272,6 +299,11 @@ sub exec_endedit($$)
  my $content        = $data->{'cgi'}->param('filecontent');
 
  return error("You cannot edit directories.") if(-d $physical);
+ return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical);
+
+ # Normalize newlines
+
+ $content =~ s/\015\012|\012|\015/\n/g;
 
  if($data->{'cgi'}->param('encode_iso'))
  {
@@ -280,15 +312,23 @@ sub exec_endedit($$)
   $content = encode_entities($content,"\200-\377");
  }
 
+ if($data->{'cgi'}->param('saveas'))
+ {
+  # Create the new filename
+
+  $physical = $data->{'new_physical'};
+  $virtual  = $data->{'new_virtual'};
+ }
+
  if(file_save($physical,\$content))
  {
-  # Saving of the file was successfull - so unlock it!
+  # Saving of the file was successful - so unlock it!
 
   return exec_unlock($data,$config);
  }
  else
  {
-  return error("Saving of file '$virtual' failed'");
+  return error("Saving of file '".encode_entities($virtual)."' failed'.",upper_path($virtual));
  }
 }
 
@@ -303,7 +343,16 @@ sub exec_endedit($$)
 
 sub exec_mkfile($$)
 {
- 1;
+ my ($data,$config) = @_;
+ my $new_physical   = $data->{'new_physical'};
+ my $new_virtual    = $data->{'new_virtual'};
+ my $dir            = upper_path($new_virtual);
+ $new_virtual       = encode_entities($new_virtual);
+
+ 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);
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_mkdir()
@@ -317,7 +366,16 @@ sub exec_mkfile($$)
 
 sub exec_mkdir($$)
 {
- 1;
+ my ($data,$config) = @_;
+ my $new_physical   = $data->{'new_physical'};
+ my $new_virtual    = $data->{'new_virtual'};
+ my $dir            = upper_path($new_virtual);
+ $new_virtual       = encode_entities($new_virtual);
+
+ 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);
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_workwithfile()
@@ -336,30 +394,51 @@ sub exec_workwithfile($$)
  my $virtual        = $data->{'virtual'};
  my $unused         = $data->{'uselist'}->unused($virtual);
 
- my $output = htmlhead("Work with file $virtual");
+ my $dir = encode_entities(upper_path($virtual));
+
+ my $output = htmlhead("Work with file ".encode_entities($virtual));
  $output   .= equal_url($config->{'httproot'},$virtual);
+
+ $virtual   = encode_entities($virtual);
+
  $output   .= dir_link($virtual);
  $output   .= "
Note: On UNIX systems, filenames are case-sensitive!
\n\n";
 
  $output .= "
Someone else is currently editing this file. So not all features are available.
\n\n" unless($unused);
 
- $output .= <
+ $output .= "
\n\n";
 
+ # Copying of the file is always allowed - but we need read access
+
+ if(-r $physical)
+ {
+  $output .= <Copy
 
-
Copy file '$virtual' to:  

+
+
+
+
Copy file '$virtual' to: $dir  

+
 
 

 
 END
+ }
 
  if($unused)
  {
+  # File is not locked
+  # Allow renaming and deleting the file
+
   $output .= <Move/rename
 
-
Move/Rename file '$virtual' to:  

+

+
+
+
Move/Rename file '$virtual' to: $dir  

+
 
 

 
@@ -374,10 +453,13 @@ END
  }
  else
  {
+  # File is locked
+  # Just display a button for unlocking it
+
   $output .= <Unlock file
 
-
Someone else is currently editing this file. At least, the file is marked so. Maybe, someone who was editing the file, has forgotten to unlock it. In this case (and only in this case) you can unlock the file using this button:

+
Someone else is currently editing this file. At least, the file is marked so. Maybe, someone who was editing the file has forgotten to unlock it. In this case (and only in this case) you can unlock the file using this button:

 
 

 
@@ -404,7 +486,24 @@ END
 
 sub exec_copy($$)
 {
- 1;
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = encode_entities($data->{'virtual'});
+ my $new_physical   = $data->{'new_physical'};
+ my $new_virtual    = $data->{'new_virtual'};
+ my $dir            = upper_path($new_virtual);
+ $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)
+ {
+  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));
+ }
+
+ copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_rename()
@@ -418,7 +517,23 @@ sub exec_copy($$)
 
 sub exec_rename($$)
 {
- 1;
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $new_physical   = $data->{'new_physical'};
+ my $new_virtual    = $data->{'new_virtual'};
+ my $dir            = upper_path($new_virtual);
+ $new_virtual       = encode_entities($new_virtual);
+
+ return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
+
+ 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));
+ }
+
+ rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual));
+ return devedit_reload({command => 'show', file => $dir});
 }
 
 # exec_remove()
@@ -436,14 +551,11 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
+ return error("Deleting directories is currently unsupported.",upper_path($virtual)) if(-d $physical);
  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
 
- my $dir = upper_path($virtual);
-
- unlink($physical);
-
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual));
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
 }
 
 # exec_unlock()
@@ -459,17 +571,13 @@ sub exec_remove($$)
 sub exec_unlock($$)
 {
  my ($data,$config) = @_;
- my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
- my $dir = upper_path($virtual);
-
  $uselist->remove_file($virtual);
  $uselist->save;
 
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
- return \$output;
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
 }
 
 # it's true, baby ;-)


 
 Save as new file: $dir 
+
+ Save as new file: $dir 
  Encode ISO-8859-1 special chars