# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2003-12-21
+# Last modified: 2004-02-23
#
use strict;
use File::Copy;
use File::Path;
-use HTML::Entities;
-use Output;
use POSIX qw(strftime);
use Tool;
+use CGI qw(header);
+use HTML::Entities;
+use Output;
+use Template;
+
my $script = $ENV{'SCRIPT_NAME'};
-my %dispatch = ('show' => \&exec_show,
- 'beginedit' => \&exec_beginedit,
- 'canceledit' => \&exec_unlock,
- 'endedit' => \&exec_endedit,
- 'mkdir' => \&exec_mkdir,
- 'mkfile' => \&exec_mkfile,
- 'workwithfile' => \&exec_workwithfile,
- 'workwithdir' => \&exec_workwithdir,
- 'copy' => \&exec_copy,
- 'rename' => \&exec_rename,
- 'remove' => \&exec_remove,
- 'rmdir' => \&exec_rmdir,
- 'unlock' => \&exec_unlock
+my %dispatch = ('show' => \&exec_show,
+ 'beginedit' => \&exec_beginedit,
+ 'canceledit' => \&exec_canceledit,
+ 'endedit' => \&exec_endedit,
+ 'mkdir' => \&exec_mkdir,
+ 'mkfile' => \&exec_mkfile,
+ 'copy' => \&exec_copy,
+ 'rename' => \&exec_rename,
+ 'remove' => \&exec_remove,
+ 'unlock' => \&exec_unlock
);
### Export ###
{
my ($command,$data,$config) = @_;
- return error("Unknown command: $command") unless($dispatch{$command});
+ return error($config->{'err_cmd_unknown'},'/',{COMMAND => $command}) unless($dispatch{$command});
my $output = &{$dispatch{$command}}($data,$config);
return $output;
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- my $output;
+
+ 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->{'tpl_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
my @stat = stat($physical."/".$dir);
my $virt_path = encode_entities($virtual.$dir."/");
- $output .= " ";
- $output .= "[SUBDIR] ";
- $output .= strftime($config->{'timeformat'},localtime($stat[9]));
- $output .= " " x 10;
- $output .= "<a href=\"$script?command=show&file=$virt_path\">".encode_entities($dir)."/</a>";
- $output .= " " x ($max_name_len - length($dir) - 1)."\t (";
- $output .= "<a href=\"$script?command=workwithdir&file=$virt_path\">Work with directory</a>)\n";
+ my $dtpl = new Template;
+ $dtpl->read_file($config->{'tpl_dirlist_dir'});
+
+ $dtpl->fillin("DIR",$virt_path);
+ $dtpl->fillin("DIR_NAME",$dir);
+ $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+
+ $dirlist .= $dtpl->get_template;
}
# Files
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($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->{'tpl_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])));
- 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);
+ $ftpl->parse_if_block("editable",-w $phys_path && -r $phys_path && -T $phys_path && not $in_use);
- $output .= '">View</span>';
- }
-
- $output .= " | ";
-
- # Link "Edit"
-
- 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="';
+ $ftpl->parse_if_block("in_use",$in_use);
+ $ftpl->parse_if_block("unused",not $in_use);
- $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"
-
- $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Work with file</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->{'tpl_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->{'err_noview'},upper_path($virtual)) unless(-r $physical);
# Check on binary files
# We have to do it in this way, or empty files
{
# Binary file
- return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+ return error($config->{'err_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 $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->{'tpl_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->fillin("CONTENT",encode_entities($$content));
}
}
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
+
return \$output;
}
my $virtual = $data->{'virtual'};
my $uselist = $data->{'uselist'};
- return error("You cannot edit directories.",upper_path($virtual)) if(-d $physical);
+ return error($config->{'err_editdir'},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->{'err_noedit'},upper_path($virtual)) unless(-r $physical && -w $physical);
# Check on binary files
{
# Binary file
- return error("This editor is not able to view/edit binary files.",upper_path($virtual));
+ return error($config->{'err_binary'},upper_path($virtual));
}
else
{
$uselist->add_file($virtual);
$uselist->save;
- my $dir = upper_path($virtual);
- my $content = encode_entities(${file_read($physical)});
+ my $content = file_read($physical);
+ $$content =~ s/\015\012|\012|\015/\n/g;
- my $equal_url = equal_url($config->{'httproot'},$virtual);
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_editfile'});
- $virtual = encode_entities($virtual);
+ $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));
- 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 $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
-<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>
-
-<form action="$script" method="post">
-<input type="hidden" name="command" value="endedit">
-<input type="hidden" name="file" value="$virtual">
-
-<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()
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
$physical = $data->{'new_physical'};
$virtual = $data->{'new_virtual'};
+
+ # Check if someone else is editing the new file
+
+ return error_in_use($virtual) if($uselist->in_use($virtual));
}
+ return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical);
+ return error($config->{'err_noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical);
+
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
{
- return error("Saving of file '".encode_entities($virtual)."' failed'. The file could be damaged, please check it's integrity.",upper_path($virtual));
+ return error($config->{'err_edit_failed'},upper_path($virtual),{FILE => $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->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
- file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir);
+ file_create($new_physical) or return error($config->{'err_mkfile_failed'},$dir,{FILE => $new_virtual});
return devedit_reload({command => 'show', file => $dir});
}
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->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
- mkdir($new_physical,0777) or return error("Could not create directory '$new_virtual'.",$dir);
+ mkdir($new_physical,0777) or return error($config->{'err_mkdir_failed'},$dir,{DIR => $new_virtual});
return devedit_reload({command => 'show', file => $dir});
}
-# exec_workwithfile()
+# exec_copy()
#
-# Display a form for renaming/copying/removing/unlocking a file
+# Copy a file and return to directory view
#
# Params: 1. Reference to user input hash
# 2. Reference to config hash
#
# Return: Output of the command (Scalar Reference)
-sub exec_workwithfile($$)
+sub exec_copy($$)
{
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";
-
- $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)
- {
- $output .= <<END;
-<h2>Copy</h2>
-
-<form action="$script">
-<input type="hidden" name="command" value="copy">
-<input type="hidden" name="file" value="$virtual">
-<p>Copy file '$virtual' to:<br>$dir <input type="text" name="newfile" size="30"> <input type="submit" value="Copy!"></p>
-</form>
-
-<hr>
+ my $virtual = encode_entities($data->{'virtual'});
+ my $new_physical = $data->{'new_physical'};
-END
- }
+ return error($config->{'err_nocopy'}) unless(-r $physical);
- if($unused)
+ if($new_physical)
{
- # File is not locked
- # Allow renaming and deleting the file
-
- $output .= <<END;
-<h2>Move/rename</h2>
-
-<form action="$script">
-<input type="hidden" name="command" value="rename">
-<input type="hidden" name="file" value="$virtual">
-<p>Move/Rename file '$virtual' to:<br>$dir <input type="text" name="newfile" size="30"> <input type="submit" value="Move/Rename!"></p>
-</form>
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
-<hr>
-
-<h2>Remove</h2>
+ if(-e $new_physical)
+ {
+ return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
-<p>Click on the button below to remove the file '$virtual'.</p>
+ if(-d $new_physical)
+ {
+ return error($config->{'err_dircopy'});
+ }
+ elsif(not $data->{'cgi'}->param('confirmed'))
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_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;
+ }
+ }
-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="remove">
-<p><input type="submit" value="Remove!"></p>
-</form>
-END
+ copy($physical,$new_physical) or return error($config->{'err_copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual});
+ return devedit_reload({command => 'show', file => $dir});
}
else
{
- # File is locked
- # Just display a button for unlocking it
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_copyfile'});
- $output .= <<END;
-<h2>Unlock file</h2>
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",upper_path($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_workwithdir()
+# exec_rename()
#
-# Display a form for renaming/removing a directory
+# Rename/move a file and return to directory view
#
# Params: 1. Reference to user input hash
# 2. Reference to config hash
#
# Return: Output of the command (Scalar Reference)
-sub exec_workwithdir($$)
+sub exec_rename($$)
{
my ($data,$config) = @_;
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
+ my $new_physical = $data->{'new_physical'};
- my $dir = encode_entities(upper_path($virtual));
-
- my $output = htmlhead("Work with directory ".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";
- $output .= "<hr>\n\n";
-
- $output .= <<END;
-<h2>Move/rename</h2>
+ return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
-<form action="$script">
-<input type="hidden" name="command" value="rename">
-<input type="hidden" name="file" value="$virtual">
-<p>Move/Rename directory '$virtual' to:<br>$dir <input type="text" name="newfile" size="50"> <input type="submit" value="Move/Rename!"></p>
-</form>
+ if($new_physical)
+ {
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
-<hr>
+ if(-e $new_physical)
+ {
+ return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'}));
-<h2>Remove</h2>
+ if(-d $new_physical)
+ {
+ return error($config->{'err_dircopy'});
+ }
+ elsif(not $data->{'cgi'}->param('confirmed'))
+ {
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_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;
+ }
+ }
-<p>Click on the button below to completely remove the directory '$virtual' and oll of it's files and sub directories.</p>
+ rename($physical,$new_physical) or return error($config->{'err_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->{'tpl_renamefile'});
-<form action="$script" method="get">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="command" value="rmdir">
-<p><input type="submit" value="Remove!"></p>
-</form>
-END
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
- $output .= "\n<hr>";
- $output .= htmlfoot;
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
- return \$output;
+ return \$output;
+ }
}
-# exec_copy()
+# exec_remove()
#
-# Copy 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
#
# Return: Output of the command (Scalar Reference)
-sub exec_copy($$)
+sub exec_remove($$)
{
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);
+ my $virtual = $data->{'virtual'};
- if(-e $new_physical)
+ if(-d $physical)
{
- if(-d $new_physical)
+ # Remove a directory
+
+ if($data->{'cgi'}->param('confirmed'))
{
- return error("A directory called '$new_virtual' already exists. You cannot replace a directory by a file!",$dir);
+ rmtree($physical);
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
}
- elsif(not $data->{'cgi'}->param('confirmed'))
+ else
{
- $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>
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_confirm_rmdir'});
-<form action="$script" method="get">
-<input type="hidden" name="command" value="copy">
-<input type="hidden" name="file" value="$virtual">
-<input type="hidden" name="newfile" value="$new_virtual">
-<input type="hidden" name="confirmed" value="1">
+ $tpl->fillin("DIR",$virtual);
+ $tpl->fillin("UPPER_DIR",upper_path($virtual));
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
-<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;
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
return \$output;
}
}
-
- if($data->{'uselist'}->in_use($data->{'new_virtual'}))
+ else
{
- return error("The target file '$new_virtual' already exists and it is edited by someone else.",$dir);
- }
+ # Remove a file
- copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual));
- return devedit_reload({command => 'show', file => $dir});
-}
+ return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
-# exec_rename()
-#
-# Rename/move a file and return to directory view
-#
-# Params: 1. Reference to user input hash
-# 2. Reference to config hash
-#
-# Return: Output of the command (Scalar Reference)
-
-sub exec_rename($$)
-{
- 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)
- {
- if(-d $new_physical)
+ if($data->{'cgi'}->param('confirmed'))
{
- return error("A directory called '$new_virtual' already exists. You cannot replace a directory!",upper_path($virtual));
+ unlink($physical) or return error($config->{'err_delete_failed'},upper_path($virtual),{FILE => $virtual});
+ return devedit_reload({command => 'show', file => upper_path($virtual)});
}
- elsif(not $data->{'cgi'}->param('confirmed'))
+ else
{
- $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">
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_confirm_rmfile'});
-<p><input type="submit" value="Yes"></p>
-</form>
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
-<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;
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
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));
- return devedit_reload({command => 'show', file => $dir});
-}
-
-# exec_remove()
-#
-# Remove a file and return to directory view
-#
-# Params: 1. Reference to user input hash
-# 2. Reference to config hash
-#
-# Return: Output of the command (Scalar Reference)
-
-sub exec_remove($$)
-{
- my ($data,$config) = @_;
- my $physical = $data->{'physical'};
- my $virtual = $data->{'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)});
}
-# exec_rmdir()
+# exec_unlock()
#
-# Remove a directory and return to directory view
+# Remove a file from the list of used files and
+# return to directory view
#
# Params: 1. Reference to user input hash
# 2. Reference to config hash
#
# Return: Output of the command (Scalar Reference)
-sub exec_rmdir($$)
+sub exec_unlock($$)
{
my ($data,$config) = @_;
- my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- return exec_remove($data,$config) if(not -d $physical);
-
if($data->{'cgi'}->param('confirmed'))
{
- rmtree($physical);
+ file_unlock($data->{'uselist'},$virtual);
return devedit_reload({command => 'show', file => upper_path($virtual)});
}
else
{
- my $dir = encode_entities(upper_path($virtual));
- my $output;
-
- $output = htmlhead("Remove directory $virtual");
- $output .= equal_url($config->{'httproot'},$virtual);
+ my $tpl = new Template;
+ $tpl->read_file($config->{'tpl_confirm_unlock'});
- $virtual = encode_entities($virtual);
+ $tpl->fillin("FILE",$virtual);
+ $tpl->fillin("DIR",upper_path($virtual));
+ $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+ $tpl->fillin("SCRIPT",$script);
- $output .= dir_link($virtual);
-
- $output .= <<"END";
-<p>Do you really want to remove the directory '$virtual' and all of it's files and sub directories?</p>
-
-<form action="$script" method="get">
-<input type="hidden" name="command" value="rmdir">
-<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;
+ my $output = header(-type => "text/html");
+ $output .= $tpl->get_template;
return \$output;
}
}
-# exec_unlock()
-#
-# Remove a file from the list of used files and
-# return to directory view
-#
-# Params: 1. Reference to user input hash
-# 2. Reference to config hash
-#
-# Return: Output of the command (Scalar Reference)
-
-sub exec_unlock($$)
-{
- my ($data,$config) = @_;
- my $virtual = $data->{'virtual'};
- my $uselist = $data->{'uselist'};
-
- $uselist->remove_file($virtual);
- $uselist->save;
-
- return devedit_reload({command => 'show', file => upper_path($virtual)});
-}
-
# it's true, baby ;-)
1;
git.p6c8.net / devedit.git / blobdiff