X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/e7d91227055ce4f15477dc60c4d54a844928878d..b5ad046f9519385786cb0faa8dbf165f6d733dee:/modules/Command.pm?ds=inline
diff --git a/modules/Command.pm b/modules/Command.pm
index 0a368e9..451a183 100644
--- 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>
-# Last modified: 2003-11-10
+# Last modified: 2004-10-27
#
use strict;
-use vars qw(@EXPORT
- $script);
+use vars qw(@EXPORT);
use File::Access;
use File::Copy;
+use File::Path;
-use HTML::Entities;
-use Output;
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 = 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()
#
@@ -48,62 +84,61 @@ use base qw(Exporter);
#
# 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 $output;
+ my $uselist = $data->{'uselist'};
+
+ my $tpl = new Template;
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'};
- $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 "/")
{
- my $upper = $physical."/..";
- my @stat = stat($upper);
-
- $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 @stat = stat($physical."/..");
- # Get the length of the longest file/directory name
+ my $udtpl = new Template;
+ $udtpl->read_file($config->{'templates'}->{'dirlist_up'});
- my $max_name_len = 0;
+ $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
+ $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
- foreach(@$dirs,@$files)
- {
- my $length = length($_);
- $max_name_len = $length if($length > $max_name_len);
+ $dirlist .= $udtpl->get_template;
}
# 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'});
+
+ $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));
- $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->parse_if_block("users",$users && -o $physical."/".$dir);
+
+ $dirlist .= $dtpl->get_template;
}
# Files
@@ -114,91 +149,47 @@ sub exec_show($$$)
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);
- $output .= " " x (10 - length($stat[7]));
- $output .= $stat[7];
- $output .= " ";
- $output .= strftime($config->{'timeformat'},localtime($stat[9]));
- $output .= " " x 10;
- $output .= encode_entities($file);
- $output .= " " x ($max_name_len - length($file))."\t (";
+ my $ftpl = new Template;
+ $ftpl->read_file($config->{'templates'}->{'dirlist_file'});
- # Link "View"
+ $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));
- if(-r $phys_path && -T $phys_path)
- {
- $output .= "<a href=\"$script?command=show&file=$virt_path\">View</a>";
- }
- else
- {
- $output .= '<span style="color:#C0C0C0" title="';
+ $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 .= (not -r $phys_path) ? "Not readable" :
- (-B $phys_path) ? "Binary file" : "";
+ $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}));
- $output .= '">View</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 .= " | ";
+ $ftpl->parse_if_block("in_use",$in_use);
+ $ftpl->parse_if_block("unused",not $in_use);
- # Link "Edit"
+ $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
- if(-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
- {
- $output .= "<a href=\"$script?command=beginedit&file=$virt_path\">Edit</a>";
- }
- else
- {
- $output .= '<span style="color:#C0C0C0" title="';
-
- $output .= (not -r $phys_path) ? "Not readable" :
- (not -w $phys_path) ? "Read only" :
- (-B $phys_path) ? "Binary file" :
- ($in_use) ? "In use" : "";
-
- $output .= '">Edit</span>';
- }
-
- # Link "Do other stuff"
+ $ftpl->parse_if_block("users",$users && -o $phys_path);
- $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Do other stuff</a>)\n";
+ $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
- 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
@@ -208,25 +199,40 @@ END
{
# 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
- $output = htmlhead("Contents of file ".encode_entities($virtual));
- $output .= equal_url($config->{'httproot'},$virtual);
- $output .= dir_link($virtual);
+ my $size = (stat($physical))[7];
+
+ 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 .= '<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>";
+ $tpl->read_file($config->{'templates'}->{'viewfile'});
- $output .= htmlfoot;
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
+
+ $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual));
+
+ $tpl->fillin("CONTENT",encode_entities($$content));
+ }
}
}
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
+
return \$output;
}
@@ -246,9 +252,9 @@ sub exec_beginedit($$)
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
@@ -256,58 +262,57 @@ sub exec_beginedit($$)
{
# 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
-
- $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()
@@ -325,9 +330,15 @@ sub exec_endedit($$)
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $content = $data->{'cgi'}->param('filecontent');
+ my $uselist = $data->{'uselist'};
- 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);
+ # We already unlock the file at the beginning of the
+ # subroutine, because if we have to abort this routine,
+ # the file keeps locked.
+ # Nobody else will access the file during this routine
+ # because of the concept of File::UseList.
+
+ file_unlock($uselist,$virtual);
# Normalize newlines
@@ -340,23 +351,31 @@ sub exec_endedit($$)
$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'};
+
+ # 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!
- return exec_unlock($data,$config);
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
}
else
{
- return error("Saving of file '".encode_entities($virtual)."' failed'.",upper_path($virtual));
+ return error($config->{'errors'}->{'edit_failed'},upper_path($virtual),{FILE => $virtual});
}
}
@@ -377,10 +396,26 @@ sub exec_mkfile($$)
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);
- file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
+
+ return \$output;
+ }
}
# exec_mkdir()
@@ -400,107 +435,86 @@ sub exec_mkdir($$)
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'});
+
+ $tpl->fillin("DIR","/");
+ $tpl->fillin("SCRIPT",$script);
+
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
- mkdir($new_physical) or return error("Could not create directory '$new_virtual'.",$dir);
- return devedit_reload({command => 'show', file => $dir});
+ 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)
-sub exec_workwithfile($$)
+sub exec_upload($$)
{
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);
-
- $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";
+ my $cgi = $data->{'cgi'};
- $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
{
- # 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()
@@ -518,20 +532,64 @@ sub exec_copy($$)
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()
@@ -549,24 +607,69 @@ sub exec_rename($$)
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'});
- 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});
+ $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_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
@@ -579,11 +682,141 @@ 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));
+ 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);
+ }
+
+ if($group)
+ {
+ return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => $group}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
+ system("chgrp",$group,$physical);
+ }
+
+ 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()
@@ -602,10 +835,102 @@ sub exec_unlock($$)
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 ;-)