exec_unlock() now checks if the file is really in use. Otherwise, we return to

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 44419ba7eeb5cd5c59d2ddd62727a564c07f97a7..591c8b12a1d6c7a222a8ef0fd58bf3d4e6edfba0 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,38 +6,74 @@ 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-10-30
+# Last modified: 2004-10-05

 #
 
 use strict;
 
 #
 
 use strict;
 

-use vars qw(@EXPORT
-            $script);
+use vars qw(@EXPORT);

 
 use File::Access;
 use File::Copy;
 
 use File::Access;
 use File::Copy;

+use File::Path;

 
 

-use HTML::Entities;
-use Output;

 use POSIX qw(strftime);
 use Tool;
 
 use POSIX qw(strftime);
 use Tool;
 

-$script = $ENV{'SCRIPT_NAME'};
+use CGI qw(header);
+use HTML::Entities;
+use Output;
+use Template;
+
+my $script = $ENV{'SCRIPT_NAME'};
+my $users  = eval("getpwuid(0)") && eval("getgrgid(0)");
+
+my %dispatch = ('show'       => \&exec_show,
+                'beginedit'  => \&exec_beginedit,
+                'canceledit' => \&exec_canceledit,
+                'endedit'    => \&exec_endedit,
+                'mkdir'      => \&exec_mkdir,
+                'mkfile'     => \&exec_mkfile,
+                'upload'     => \&exec_upload,
+                'copy'       => \&exec_copy,
+                'rename'     => \&exec_rename,
+                'remove'     => \&exec_remove,
+                'chprop'     => \&exec_chprop,
+                'unlock'     => \&exec_unlock,
+                'about'      => \&exec_about
+               );

 
 ### Export ###
 
 use base qw(Exporter);
 
 
 ### Export ###
 
 use base qw(Exporter);
 

-@EXPORT = qw(exec_show
-             exec_beginedit
-             exec_endedit
-             exec_mkfile
-             exec_mkdir
-             exec_workwithfile
-             exec_copy
-             exec_rename
-             exec_remove
-             exec_unlock);
+@EXPORT = qw(exec_command);
+
+# exec_command()
+#
+# Execute the specified command
+#
+# Params: 1. Command to execute
+#         2. Reference to user input hash
+#         3. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_command($$$)
+{
+ my ($command,$data,$config) = @_;
+
+ foreach(keys(%dispatch))
+ {
+  if(lc($_) eq lc($command))
+  {
+   my $output = &{$dispatch{$_}}($data,$config);
+   return $output;
+  }
+ }
+
+ return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command});
+}

 
 # exec_show()
 #
 
 # exec_show()
 #


@@ -48,62 +84,61 @@ use base qw(Exporter);
 #
 # Return: Output of the command (Scalar Reference)
 
 #
 # Return: Output of the command (Scalar Reference)
 

-sub exec_show($$$)
+sub exec_show($$)

 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

- my $output;
+ my $uselist        = $data->{'uselist'};
+
+ my $tpl = new Template;

 
  if(-d $physical)
  {
   # Create directory listing
 
   my $direntries = dir_read($physical);
 
  if(-d $physical)
  {
   # Create directory listing
 
   my $direntries = dir_read($physical);

-  return error("Reading of directory $virtual failed.",upper_path($virtual)) unless($direntries);
+  return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$virtual'}) unless($direntries);

 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 

-  $output .= htmlhead("Directory listing of $virtual");
-  $output .= equal_url($config->{'httproot'},$virtual);
-  $output .= "<hr>\n\n<pre>\n";
+  my $dirlist = "";

 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 
   unless($virtual eq "/")
   {
 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 
   unless($virtual eq "/")
   {

-   my $upper = $physical."/..";
-   my @stat  = stat($upper);
+   my @stat  = stat($physical."/..");

 
 

-   $output .= "  [SUBDIR]  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "<a href=\"$script?command=show&file=".encode_entities(upper_path($virtual))."\">../</a>\n";
-  }
+   my $udtpl = new Template;
+   $udtpl->read_file($config->{'templates'}->{'dirlist_up'});

 
 

-  # Get the length of the longest file/directory name
+   $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
+   $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));

 
 

-  my $max_name_len = 0;
-
-  foreach(@$dirs,@$files)
-  {
-   my $length    = length($_);
-   $max_name_len = $length if($length > $max_name_len);
+   $dirlist .= $udtpl->get_template;

   }
 
   # Directories
 
   foreach my $dir(@$dirs)
   {
   }
 
   # Directories
 
   foreach my $dir(@$dirs)
   {

-   my @stat = stat($physical."/".$dir);
+   my @stat      = stat($physical."/".$dir);
+   my $virt_path = encode_entities($virtual.$dir."/");
+
+   my $dtpl = new Template;
+   $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});

 
 

-   $output .= "  ";
-   $output .= "[SUBDIR]  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "<a href=\"$script?command=show&file=".encode_entities($virtual.$dir)."/\">".encode_entities($dir)."/</a>\n";
+   $dtpl->fillin("DIR",$virt_path);
+   $dtpl->fillin("DIR_NAME",$dir);
+   $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
+
+   $dtpl->parse_if_block("users",$users && -o $physical."/".$dir);
+
+   $dirlist .= $dtpl->get_template;

   }
 
   # Files
   }
 
   # Files


@@ -114,63 +149,47 @@ sub exec_show($$$)
    my $virt_path = encode_entities($virtual.$file);
 
    my @stat      = stat($phys_path);
    my $virt_path = encode_entities($virtual.$file);
 
    my @stat      = stat($phys_path);

-   my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
+   my $in_use    = $uselist->in_use($virtual.$file);
+
+   my $ftpl = new Template;
+   $ftpl->read_file($config->{'templates'}->{'dirlist_file'});

 
 

-   $output .= " " x (10 - length($stat[7]));
-   $output .= $stat[7];
-   $output .= "  ";
-   $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  (";
+   $ftpl->fillin("FILE",$virt_path);
+   $ftpl->fillin("FILE_NAME",$file);
+   $ftpl->fillin("SIZE",$stat[7]);
+   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+   $ftpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));

 
 

-   $output .= (-r $phys_path && -T $phys_path)
-              ? "<a href=\"$script?command=show&file=$virt_path\">View</a>"
-              : '<span style="color:#C0C0C0">View</span>';
+   $ftpl->parse_if_block("not_readable",not -r $phys_path);
+   $ftpl->parse_if_block("binary",-B $phys_path);
+   $ftpl->parse_if_block("readonly",not -w $phys_path);

 
 

-   $output .= " | ";
+   $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}));

 
 

-   $output .= (-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
-              ? "<a href=\"$script?command=beginedit&file=$virt_path\">Edit</a>"
-              : '<span style="color:#C0C0C0">Edit</span>';
+   $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}) && not $in_use);

 
 

-   $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Do other stuff</a>)\n";
+   $ftpl->parse_if_block("in_use",$in_use);
+   $ftpl->parse_if_block("unused",not $in_use);
+
+   $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
+
+   $ftpl->parse_if_block("users",$users && -o $phys_path);
+
+   $dirlist .= $ftpl->get_template;

   }
 
   }
 

-  $output .= "</pre>\n\n<hr>\n\n";
-
-  # Bottom of directory listing
-  # (Fields for creating files and directories)
-
-  $output .= <<END;
-<table border="0">
-<tr>
-<form action="$script">
-<input type="hidden" name="command" value="mkdir">
-<input type="hidden" name="curdir" value="$virtual">
-<td>Create new directory:</td>
-<td>$virtual <input type="text" name="newfile"> <input type="submit" value="Create!"></td>
-</form>
-</tr>
-<tr>
-<td>Create new file:</td>
-<form action="$script">
-<input type="hidden" name="command" value="mkfile">
-<input type="hidden" name="curdir" value="$virtual">
-<td>$virtual <input type="text" name="newfile"> <input type="submit" value="Create!"></td>
-</form>
-</tr>
-</table>
-
-<hr>
-END
-  $output .= htmlfoot;
+  $tpl->read_file($config->{'templates'}->{'dirlist'});
+
+  $tpl->fillin("DIRLIST",$dirlist);
+  $tpl->fillin("DIR",$virtual);
+  $tpl->fillin("SCRIPT",$script);
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));

  }
  else
  {
   # View a file
 
  }
  else
  {
   # View a file
 

-  return error("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical);
+  return error($config->{'errors'}->{'noview'},upper_path($virtual)) unless(-r $physical);

 
   # Check on binary files
   # We have to do it in this way, or empty files
 
   # Check on binary files
   # We have to do it in this way, or empty files


@@ -180,25 +199,39 @@ END
   {
    # Binary file
 
   {
    # Binary file
 

-   return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+   return error($config->{'errors'}->{'binary'},upper_path($virtual));

   }
   else
   {
    # Text file
 
   }
   else
   {
    # Text file
 

-   $output  = htmlhead("Contents of file ".encode_entities($virtual));
-   $output .= equal_url($config->{'httproot'},$virtual);
-   $output .= dir_link($virtual);
+   my $size = (stat($physical))[7];

 
 

-   $output .= '<div style="background-color:#FFFFE0;border:1px solid black;margin-top:10px;width:100%">'."\n";
-   $output .= '<pre style="color:#0000C0;">'."\n";
-   $output .= encode_entities(${file_read($physical)});
-   $output .= "\n</pre>\n</div>";
+   if($config->{'max_file_size'} && $size > $config->{'max_file_size'})
+   {
+    return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
+   }
+   else
+   {
+    my $content =  file_read($physical);
+    $$content   =~ s/\015\012|\012|\015/\n/g;

 
 

-   $output .= htmlfoot;
+    $tpl->read_file($config->{'templates'}->{'viewfile'});
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("DIR",upper_path($virtual));
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+    $tpl->fillin("CONTENT",encode_entities($$content));
+
+    $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual));
+   }

   }
  }
 
   }
  }
 

+ my $output  = header(-type => "text/html");
+ $output    .= $tpl->get_template;
+

  return \$output;
 }
 
  return \$output;
 }
 


@@ -218,9 +251,9 @@ sub exec_beginedit($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 

- 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);
+ return error($config->{'errors'}->{'editdir'},upper_path($virtual))                   if(-d $physical);
+ return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
+ return error($config->{'errors'}->{'noedit'},upper_path($virtual))                    unless(-r $physical && -w $physical);

 
  # Check on binary files
 
 
  # Check on binary files
 


@@ -228,58 +261,57 @@ sub exec_beginedit($$)
  {
   # Binary file
 
  {
   # Binary file
 

-  return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+  return error($config->{'errors'}->{'binary'},upper_path($virtual));

  }
  else
  {
  }
  else
  {

-  # Text file
-
-  $uselist->add_file($virtual);
-  $uselist->save;
-
-  my $dir       = upper_path($virtual);
-  my $content   = encode_entities(${file_read($physical)});
+  if($config->{'max_file_size'} && (stat($physical))[7] > $config->{'max_file_size'})
+  {
+   return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
+  }
+  else
+   {
+   # Text file

 
 

-  my $equal_url = equal_url($config->{'httproot'},$virtual);
+   $uselist->add_file($virtual);
+   $uselist->save;

 
 

-  $virtual   = encode_entities($virtual);
+   my $content =  file_read($physical);
+   $$content   =~ s/\015\012|\012|\015/\n/g;

 
 

-  my $output = htmlhead("Edit file $virtual");
-  $output   .= $equal_url;
-  $output   .= <<END;
-<p><b style="color:#FF0000">Caution!</b> This file is locked for other users while you are editing it. To unlock it, click <i>Save and exit</i> or <i>Exit WITHOUT saving</i>. Please <b>don't</b> click the <i>Reload</i> button in your browser! This will confuse the editor.</p>
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'editfile'});

 
 

-<form action="$script" method="get">
-<input type="hidden" name="command" value="canceledit">
-<input type="hidden" name="file" value="$virtual">
-<p><input type="submit" value="Exit WITHOUT saving"></p>
-</form>
+   $tpl->fillin("FILE",$virtual);
+   $tpl->fillin("DIR",upper_path($virtual));
+   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+   $tpl->fillin("SCRIPT",$script);
+   $tpl->fillin("CONTENT",encode_entities($$content));

 
 

-<form action="$script" method="post">
-<input type="hidden" name="command" value="endedit">
-<input type="hidden" name="file" value="$virtual">
+   my $output = header(-type => "text/html");
+   $output   .= $tpl->get_template;

 
 

-<table width="100%" border="1">
-<tr>
-<td width="50%" align="center">
-<input type="hidden" name="file" value="$virtual">
-<input type="checkbox" name="saveas" value="1"> Save as new file: $dir <input type=text name="newfile" value=""></td>
-<td width="50%" align="center"><input type="checkbox" name="encode_iso" value="1"> Encode ISO-8859-1 special chars</td>
-</tr>
-<tr>
-<td align="center"><input type="reset" value="Reset form"></td>
-<td align="center"><input type="submit" value="Save and exit"></td>
-</tr>
-</table>
+   return \$output;
+  }
+ }
+}

 
 

-<textarea name="filecontent" rows="25" cols="120">$content</textarea>
-</form>
-END
+# exec_canceledit()
+#
+# Abort file editing
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)

 
 

-  $output .= htmlfoot;
+sub exec_canceledit($$)
+{
+ my ($data,$config) = @_;
+ my $virtual        = $data->{'virtual'};

 
 

-  return \$output;
- }
+ file_unlock($data->{'uselist'},$virtual);
+ return devedit_reload({command => 'show', file => upper_path($virtual)});

 }
 
 # exec_endedit()
 }
 
 # exec_endedit()


@@ -297,9 +329,7 @@ sub exec_endedit($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $content        = $data->{'cgi'}->param('filecontent');
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  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);
+ my $uselist        = $data->{'uselist'};

 
  # Normalize newlines
 
 
  # Normalize newlines
 


@@ -312,23 +342,36 @@ sub exec_endedit($$)
   $content = encode_entities($content,"\200-\377");
  }
 
   $content = encode_entities($content,"\200-\377");
  }
 

- if($data->{'cgi'}->param('saveas'))
+ if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')

  {
   # Create the new filename
 
   $physical = $data->{'new_physical'};
   $virtual  = $data->{'new_virtual'};
  {
   # Create the new filename
 
   $physical = $data->{'new_physical'};
   $virtual  = $data->{'new_virtual'};

+
+  # Check if someone else is editing the new file
+
+  return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));

  }
 
  }
 

+ return error($config->{'errors'}->{'text_to_binary'},upper_path($virtual)) unless(-T $physical);
+ return error($config->{'errors'}->{'editdir'},upper_path($virtual))        if(-d $physical);
+ return error($config->{'errors'}->{'noedit'}, upper_path($virtual))        if(-e $physical && !(-r $physical && -w $physical));
+

  if(file_save($physical,\$content))
  {
   # Saving of the file was successful - so unlock it!
 
  if(file_save($physical,\$content))
  {
   # Saving of the file was successful - so unlock it!
 

-  return exec_unlock($data,$config);
+  file_unlock($uselist,$data->{'virtual'});
+  #                    ^^^^^^^^^^^^^^^^^^
+  # Maybe the user saved the file using another filename...
+  # But we have to unlock the original file!
+
+  return devedit_reload({command => 'show', file => upper_path($virtual)});

  }
  else
  {
  }
  else
  {

-  return error("Saving of file '".encode_entities($virtual)."' failed'.",upper_path($virtual));
+  return error($config->{'errors'}->{'edit_failed'},upper_path($virtual),{FILE => $virtual});

  }
 }
 
  }
 }
 


@@ -349,10 +392,26 @@ sub exec_mkfile($$)
  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("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
+ if($new_physical)
+ {
+  return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+
+  file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkfile'});
+
+  $tpl->fillin("DIR","/");
+  $tpl->fillin("SCRIPT",$script);
+
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;

 
 

- file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+  return \$output;
+ }

 }
 
 # exec_mkdir()
 }
 
 # exec_mkdir()


@@ -372,107 +431,86 @@ 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("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical);
+ return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
+
+ if($new_physical)
+ {
+  mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'mkdir'});

 
 

- mkdir($new_physical) or return error("Could not create directory '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+  $tpl->fillin("DIR","/");
+  $tpl->fillin("SCRIPT",$script);
+
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

 }
 
 }
 

-# exec_workwithfile()
+# exec_upload()

 #
 #

-# Display a form for renaming/copying/deleting/unlocking a file
+# Upload a file

 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Return: Output of the command (Scalar Reference)
 
 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Return: Output of the command (Scalar Reference)
 

-sub exec_workwithfile($$)
+sub exec_upload($$)

 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 {
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};

- my $unused         = $data->{'uselist'}->unused($virtual);
-
- my $dir = encode_entities(upper_path($virtual));
-
- my $output = htmlhead("Work with file ".encode_entities($virtual));
- $output   .= equal_url($config->{'httproot'},$virtual);
+ my $cgi            = $data->{'cgi'};

 
 

- $virtual   = encode_entities($virtual);
-
- $output   .= dir_link($virtual);
- $output   .= "<p><b>Note:</b> On UNIX systems, filenames are <b>case-sensitive</b>!</p>\n\n";
-
- $output .= "<p>Someone else is currently editing this file. So not all features are available.</p>\n\n" unless($unused);
-
- $output .= "<hr>\n\n";
-
- # Copying of the file is always allowed - but we need read access
-
- if(-r $physical)
+ if(my $uploaded_file = $cgi->param('uploaded_file'))

  {
  {

-  $output .= <<END;
-<h2>Copy</h2>
+  # Process file upload

 
 

-<form action="$script">
-<input type="hidden" name="command" value="copy">
-<input type="hidden" name="file" value="$virtual">
-<p>Copy file '$virtual' to: $dir <input type="text" name="newfile" size="50"> <input type="submit" value="Copy!"></p>
-</form>
+  my $filename  = file_name($uploaded_file);
+  my $file_phys = $physical."/".$filename;
+  my $file_virt = $virtual."".$filename;

 
 

-<hr>
+  return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));

 
 

-END
- }
+  my $ascii     = $cgi->param('ascii');
+  my $handle    = $cgi->upload('uploaded_file');

 
 

- if($unused)
- {
-  # File is not locked
-  # Allow renaming and deleting the file
+  local *FILE;

 
 

-  $output .= <<END;
-<h2>Move/rename</h2>
+  open(FILE,">$file_phys") or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
+  binmode(FILE) unless($ascii);

 
 

-<form action="$script">
-<input type="hidden" name="command" value="rename">
-<input type="hidden" name="file" value="$virtual">
-<p>Move/Rename file '$virtual' to: $dir <input type="text" name="newfile" size="50"> <input type="submit" value="Move/Rename!"></p>
-</form>
+  # Read transferred file and write it to disk

 
 

-<hr>
+  read($handle, my $data, -s $handle);
+  $data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode
+  print FILE $data;

 
 

-<h2>Delete</h2>
+  close(FILE);

 
 

-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="remove">
-<p><input type="submit" value="Delete file '$virtual'!"></p>
-</form>
-END
+  return devedit_reload({command => "show", file => $virtual});

  }
  else
  {
  }
  else
  {

-  # File is locked
-  # Just display a button for unlocking it
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'upload'});

 
 

-  $output .= <<END;
-<h2>Unlock file</h2>
+  $tpl->fillin("DIR",$virtual);
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);

 
 

-<p>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 <b>only</b> in this case) you can unlock the file using this button:</p>
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;

 
 

-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="unlock">
-<p><input type="submit" value="Unlock file '$virtual'"></p>
-</form>
-END
+  return \$output;

  }
  }

-
- $output .= "\n<hr>";
- $output .= htmlfoot;
-
- return \$output;

 }
 
 # exec_copy()
 }
 
 # exec_copy()


@@ -490,20 +528,64 @@ sub exec_copy($$)
  my $physical       = $data->{'physical'};
  my $virtual        = encode_entities($data->{'virtual'});
  my $new_physical   = $data->{'new_physical'};
  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);
+ return error($config->{'errors'}->{'dircopy'}) if(-d $physical);
+ return error($config->{'errors'}->{'nocopy'})  unless(-r $physical);

 
 

- if(-e $new_physical)
+ if($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));
+  my $new_virtual = $data->{'new_virtual'};
+  my $dir         = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);
+
+  if(-e $new_physical)
+  {
+   return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+
+   if(-d $new_physical)
+   {
+    return error($config->{'errors'}->{'dir_replace'},$dir);
+   }
+   elsif(not $data->{'cgi'}->param('confirmed'))
+   {
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("NEW_FILE",$new_virtual);
+    $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
+    $tpl->fillin("NEW_DIR",$dir);
+    $tpl->fillin("DIR",upper_path($virtual));
+
+    $tpl->fillin("COMMAND","copy");
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+
+    my $output = header(-type => "text/html");
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }
+  }
+
+  copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});

  }
  }

+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'copyfile'});
+
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($virtual));
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);

 
 

- copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
- return devedit_reload({command => 'show', file => $dir});
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

 }
 
 # exec_rename()
 }
 
 # exec_rename()


@@ -521,24 +603,69 @@ sub exec_rename($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $new_physical   = $data->{'new_physical'};
  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));
+ return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
+ return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));

 
 

- if(-e $new_physical)
+ if($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));
+  my $new_virtual = $data->{'new_virtual'};
+  my $dir         = upper_path($new_virtual);
+  $new_virtual    = encode_entities($new_virtual);
+
+  if(-e $new_physical)
+  {
+   return error($config->{'errors'}->{'exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
+
+   if(-d $new_physical)
+   {
+    return error($config->{'errors'}->{'dir_replace'},$dir);
+   }
+   elsif(not $data->{'cgi'}->param('confirmed'))
+   {
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'confirm_replace'});
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("NEW_FILE",$new_virtual);
+    $tpl->fillin("NEW_FILENAME",file_name($new_virtual));
+    $tpl->fillin("NEW_DIR",$dir);
+    $tpl->fillin("DIR",upper_path($virtual));
+
+    $tpl->fillin("COMMAND","rename");
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+
+    my $output = header(-type => "text/html");
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }
+  }
+
+  rename($physical,$new_physical) or return error($config->{'errors'}->{'rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
+  return devedit_reload({command => 'show', file => $dir});

  }
  }

+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'renamefile'});
+
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($virtual));
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);

 
 

- 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});
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }

 }
 
 # exec_remove()
 #
 }
 
 # exec_remove()
 #

-# Remove a file and return to directory view
+# Remove a file or a directory and return to directory view

 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash
 #
 # Params: 1. Reference to user input hash
 #         2. Reference to config hash


@@ -551,11 +678,137 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
  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));
+ return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");

 
 

- 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(-d $physical)
+ {
+  # Remove a directory
+
+  if($data->{'cgi'}->param('confirmed'))
+  {
+   rmtree($physical);
+   return devedit_reload({command => 'show', file => upper_path($virtual)});
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
+
+   $tpl->fillin("DIR",$virtual);
+   $tpl->fillin("UPPER_DIR",upper_path($virtual));
+   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+   $tpl->fillin("SCRIPT",$script);
+
+   my $output = header(-type => "text/html");
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+ }
+ else
+ {
+  # Remove a file
+
+  return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
+
+  if($data->{'cgi'}->param('confirmed'))
+  {
+   unlink($physical) or return error($config->{'errors'}->{'delete_failed'},upper_path($virtual),{FILE => $virtual});
+   return devedit_reload({command => 'show', file => upper_path($virtual)});
+  }
+  else
+  {
+   my $tpl = new Template;
+   $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
+
+   $tpl->fillin("FILE",$virtual);
+   $tpl->fillin("DIR",upper_path($virtual));
+   $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+   $tpl->fillin("SCRIPT",$script);
+
+   my $output = header(-type => "text/html");
+   $output   .= $tpl->get_template;
+
+   return \$output;
+  }
+ }
+}
+
+# exec_chprop()
+#
+# Change the mode and the group of a file or a directory
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_chprop($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};
+ my $mode           = $cgi->param('mode');
+ my $group          = $cgi->param('group');
+
+ if($users)
+ {
+  if(-o $physical)
+  {
+   if($mode || $group)
+   {
+    if($mode)
+    {
+     my $oct_mode = $mode;
+     $oct_mode    = "0".$oct_mode if(length($oct_mode) == 3);
+     $oct_mode    = oct($oct_mode);
+
+     chmod($oct_mode,$physical);
+    }
+
+    chgrp($group,$physical) if($group);
+
+    return devedit_reload({command => 'show', file => $dir});
+   }
+   else
+   {
+    my @stat     = stat($physical);
+
+    my $mode     = $stat[2];
+    my $mode_oct = substr(sprintf("%04o",$mode),-4);
+    my $gid      = $stat[5];
+    my $group    = getgrgid($gid);
+
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'chprop'});
+
+    $tpl->fillin("MODE_OCTAL",$mode_oct);
+    $tpl->fillin("MODE_STRING",mode_string($mode));
+    $tpl->fillin("GID",$gid);
+    $tpl->fillin("GROUP",$group);
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("DIR",$dir);
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+
+    my $output = header(-type => "text/html");
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }
+  }
+  else
+  {
+   return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual});
+  }
+ }
+ else
+ {
+  return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual});
+ }

 }
 
 # exec_unlock()
 }
 
 # exec_unlock()


@@ -574,10 +827,102 @@ sub exec_unlock($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 

- $uselist->remove_file($virtual);
- $uselist->save;
+ return devedit_reload({command => 'show', file => upper_path($virtual)}) if($uselist->unused($virtual));

 
 

- return devedit_reload({command => 'show', file => upper_path($virtual)});
+ if($data->{'cgi'}->param('confirmed'))
+ {
+  file_unlock($uselist,$virtual);
+  return devedit_reload({command => 'show', file => upper_path($virtual)});
+ }
+ else
+ {
+  my $tpl = new Template;
+  $tpl->read_file($config->{'templates'}->{'confirm_unlock'});
+
+  $tpl->fillin("FILE",$virtual);
+  $tpl->fillin("DIR",upper_path($virtual));
+  $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+  $tpl->fillin("SCRIPT",$script);
+
+  my $output = header(-type => "text/html");
+  $output   .= $tpl->get_template;
+
+  return \$output;
+ }
+}
+
+# exec_about()
+#
+# Display some information about Dev-Editor
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_about($$)
+{
+ my ($data,$config) = @_;
+
+ my $tpl = new Template;
+ $tpl->read_file($config->{'templates'}->{'about'});
+
+ $tpl->fillin("SCRIPT",$script);
+
+ # Dev-Editor's version number
+
+ $tpl->fillin("VERSION",$data->{'version'});
+
+ # Some path information
+
+ $tpl->fillin("SCRIPT_PHYS",$ENV{'SCRIPT_FILENAME'});
+ $tpl->fillin("CONFIG_PATH",$data->{'configfile'});
+ $tpl->fillin("FILE_ROOT",$config->{'fileroot'});
+ $tpl->fillin("HTTP_ROOT",$config->{'httproot'});
+
+ # Perl
+
+ $tpl->fillin("PERL_PROG",$^X);
+ $tpl->fillin("PERL_VER",sprintf("%vd",$^V));
+
+ # Information about the server
+
+ $tpl->fillin("HTTPD",$ENV{'SERVER_SOFTWARE'});
+ $tpl->fillin("OS",$^O);
+ $tpl->fillin("TIME",strftime($config->{'timeformat'},localtime));
+
+ # Process information
+
+ $tpl->fillin("PID",$$);
+
+ # Check if the functions getpwuid() and getgrgid() are available
+
+ if($users)
+ {
+  # Dev-Editor is running on a system which allows users and groups
+  # So we display the user and the group of our process
+
+  $tpl->parse_if_block("users",1);
+
+  # ID's of user and group
+
+  $tpl->fillin("UID",$<);
+  $tpl->fillin("GID",$();
+
+  # Names of user and group
+
+  $tpl->fillin("USER",getpwuid($<));
+  $tpl->fillin("GROUP",getgrgid($());
+ }
+ else
+ {
+  $tpl->parse_if_block("users",0);
+ }
+
+ my $output = header(-type => "text/html");
+ $output   .= $tpl->get_template;
+
+ return \$output;

 }
 
 # it's true, baby ;-)
 }
 
 # it's true, baby ;-)