# Dev-Editor's main program
#
# Author: Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-22-2003
+# Last modified: 10-04-2003
#
use strict;
use CGI::Carp qw(fatalsToBrowser);
+use vars qw($VERSION
+ %config);
+
use lib 'modules';
use CGI;
use Output;
use Tool;
-our $VERSION = '0.7';
+$VERSION = '1.0';
### Settings ###
-our %config = (
- fileroot => 'D:/Server/WWW/Root',
- httproot => '/',
- uselist_file => 'uselist',
- lock_file => 'uselist.lock',
- lock_timeout => '10'
- );
+%config = (
+ fileroot => 'D:/Server/WWW/dokumente',
+ httproot => '/',
+ timeformat => '%d.%m.%Y %H:%M',
+ uselist_file => 'uselist',
+ lock_file => 'uselist.lock',
+ lock_timeout => '10'
+ );
### End Settings ###
my $command = $cgi->param('command') || 'show';
my $file = $cgi->param('file') || '/';
+my $curdir = $cgi->param('curdir') || '';
+my $newfile = $cgi->param('newfile') || '';
+
+# Create physical and virtual path for the new file
+# This section has to be optimized - ugh!
+
+my $new_physical = '';
+my $new_virtual = '';
+
+if($newfile ne '')
+{
+ $curdir = upper_path($file) if($curdir eq '');
+ my $path = clean_path($curdir.$newfile);
+
+ # Extract file and directory name...
+
+ my $file = file_name($path);
+ my $dir = upper_path($path);
+
+ # ... check if the directory exists ...
+
+ unless(-d clean_path($config{'fileroot'}."/".$dir))
+ {
+ abort("The directory where you want to create this file or directory doesn't exist.");
+ }
+
+ # ... and check if the path is above the root directory
+
+ unless(($new_physical,$new_virtual) = check_path($config{'fileroot'},$dir))
+ {
+ abort("You aren't allowed to create files and directories above the virtual root directory.");
+ }
+
+ # Create the physical and the virtual path
+
+ $new_physical = File::Spec->canonpath($new_physical."/".$file);
+ $new_virtual .= $file;
+}
# This check has to be performed first, or abs_path() will be confused
'beginedit' => \&exec_beginedit,
'canceledit' => \&exec_unlock,
'endedit' => \&exec_endedit,
- # 'mkdir' => \&exec_mkdir,
- # 'mkfile' => \&exec_mkfile,
+ 'mkdir' => \&exec_mkdir,
+ 'mkfile' => \&exec_mkfile,
'workwithfile' => \&exec_workwithfile,
- # 'copy' => \&exec_copy,
- # 'rename' => \&exec_rename,
+ 'copy' => \&exec_copy,
+ 'rename' => \&exec_rename,
'remove' => \&exec_remove,
'unlock' => \&exec_unlock
);
lockfile => $config{'lock_file'},
timeout => $config{'lock_timeout'});
- $uselist->lock or abort("Locking failed. Try it again in a moment. If the problem persists, ask someone to recreate the lockfile ($config{'lock_file'}).");
+ $uselist->lock or abort("Locking of $config{'uselist_file'} failed. Try it again in a moment. If the problem persists, ask someone to recreate the lock file ($config{'lock_file'}).");
$uselist->load;
# Create a hash with data submitted by user
- # (the CGI and the File::UseList objects will also be included)
+ # (the CGI and the File::UseList object will also be included)
my %data = (physical => $physical,
virtual => $virtual,
- new_physical => '',
- new_virtual => '',
+ new_physical => $new_physical,
+ new_virtual => $new_virtual,
uselist => $uselist,
cgi => $cgi);
# Execute Dev-Editor's commands
#
# Author: Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-25-2003
+# Last modified: 10-04-2003
#
use strict;
use vars qw(@EXPORT
$script);
-use CGI qw(header
- redirect);
+use CGI qw(redirect);
use File::Access;
use File::Copy;
$output .= "<a href=\"$script?command=show&file=".encode_entities(upper_path($virtual))."\">../</a>\n";
}
- # Get the longest file/directory name
+ # Get the length of the longest file/directory name
my $max_name_len = 0;
$output .= " ";
$output .= "[SUBDIR] ";
- $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
+ $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";
}
$output .= " " x (10 - length($stat[7]));
$output .= $stat[7];
$output .= " ";
- $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
+ $output .= strftime($config->{'timeformat'},localtime($stat[9]));
$output .= ($in_use) ? " (IN USE) " : (not -T $phys_path) ? " (BINARY) " : " " x 10;
$output .= encode_entities($file);
$output .= " " x ($max_name_len - length($file))."\t (";
$output .= <<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="newdirname"> <input type="submit" value="Create!"></td>
+<td>$virtual <input type="text" name="newfile"> <input type="submit" value="Create!"></td>
+</form>
</tr>
<tr>
<td>Create new file:</td>
-<td>$virtual <input type="text" name="newfilename"> <input type="submit" value="Create!"></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>
}
}
- return \$output
+ return \$output;
}
# exec_beginedit
$uselist->add_file($virtual);
$uselist->save;
- my $dir = upper_path($virtual);
- my $content = encode_entities(${file_read($physical)});
+ my $dir = upper_path($virtual);
+ my $content = encode_entities(${file_read($physical)});
- my $output = htmlhead("Edit file ".encode_entities($virtual));
- $output .= equal_url($config->{'httproot'},$virtual);
+ my $equal_url = equal_url($config->{'httproot'},$virtual);
- $virtual = encode_entities($virtual);
+ $virtual = encode_entities($virtual);
+ 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>
-<form action="$ENV{'SCRIPT_NAME'}" method="get">
+<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="$ENV{'SCRIPT_NAME'}" method="post">
+<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="checkbox" name="save_as_new_file" value="1"> Save as new file: $dir <input type=text name="new_filename" value=""></td>
+<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>
$content = encode_entities($content,"\200-\377");
}
+ if($data->{'cgi'}->param('saveas'))
+ {
+ # Create the new filename
+
+ $physical = $data->{'new_physical'};
+ $virtual = $data->{'new_virtual'};
+ }
+
if(file_save($physical,\$content))
{
- # Saving of the file was successfull - so unlock it!
+ # Saving of the file was successful - so unlock it!
return exec_unlock($data,$config);
}
else
{
- return error("Saving of file '".encode_entities($virtual)."' failed'");
+ return error("Saving of file '".encode_entities($virtual)."' failed'.");
}
}
sub exec_mkfile($$)
{
- 1;
+ my ($data,$config) = @_;
+ my $new_physical = $data->{'new_physical'};
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
+
+ return error("A file or directory called '$new_virtual' does already exist.") if(-e $new_physical);
+
+ file_create($new_physical) or return error("Could not create file '$new_virtual'.");
+
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ return \$output;
}
# exec_mkdir()
sub exec_mkdir($$)
{
- 1;
+ my ($data,$config) = @_;
+ my $new_physical = $data->{'new_physical'};
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
+
+ return error("A file or directory called '$new_virtual' does already exist.") if(-e $new_physical);
+
+ mkdir($new_physical) or return error("Could not create directory '$new_virtual'.");
+
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ return \$output;
}
# exec_workwithfile()
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);
<h2>Copy</h2>
-<p>Copy file '$virtual' to: <input type="text" name="newfilename" size="50"> <input type="submit" value="Copy!"></p>
+<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>
<hr>
$output .= <<END;
<h2>Move/rename</h2>
-<p>Move/Rename file '$virtual' to: <input type="text" name="newfilename" size="50"> <input type="submit" value="Move/Rename!"></p>
+<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>
<hr>
sub exec_copy($$)
{
- 1;
+ my ($data,$config) = @_;
+ my $physical = $data->{'physical'};
+ my $virtual = encode_entities($data->{'virtual'});
+ my $new_physical = $data->{'new_physical'};
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
+
+ return error("This editor is not able to copy directories.") if(-d $physical);
+
+ if(-e $new_physical)
+ {
+ return error("A file or directory called '$new_virtual' does already exists and this editor is currently not able to ask to overwrite the existing file or directory.");
+ }
+
+ copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'");
+
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ return \$output;
}
# exec_rename()
sub exec_rename($$)
{
- 1;
+ my ($data,$config) = @_;
+ my $physical = $data->{'physical'};
+ my $virtual = $data->{'virtual'};
+ my $new_physical = $data->{'new_physical'};
+ my $new_virtual = $data->{'new_virtual'};
+ my $dir = upper_path($new_virtual);
+ $new_virtual = encode_entities($new_virtual);
+
+ return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
+
+ if(-e $new_physical)
+ {
+ return error("A file or directory called '$new_virtual' does already exists and this editor is currently not able to ask to overwrite the existing file or directory.");
+ }
+
+ rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.");
+
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ return \$output;
}
# exec_remove()
my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
- return error("Deleting of directories is currently unsupported") if(-d $physical);
+ return error("Deleting directories is currently unsupported") if(-d $physical);
return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
- my $dir = upper_path($virtual);
-
unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.");
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual));
return \$output;
}
sub exec_unlock($$)
{
my ($data,$config) = @_;
- my $physical = $data->{'physical'};
my $virtual = $data->{'virtual'};
my $uselist = $data->{'uselist'};
- my $dir = upper_path($virtual);
-
$uselist->remove_file($virtual);
$uselist->save;
- my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir");
+ my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual));
return \$output;
}
# Some shared sub routines
#
# Author: Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-22-2003
+# Last modified: 10-03-2003
#
use strict;
use vars qw(@EXPORT);
-use Carp qw(croak);
-
use Cwd qw(abs_path);
use File::Basename;
use File::Spec;
@EXPORT = qw(check_path
clean_path
- filemode
+ file_name
upper_path);
# check_path()
return $path;
}
-# filemode()
+# file_name()
#
-# Creates a readable string of a UNIX filemode number
-# (copied from Tool.pm of Dev-Editor 0.1.4)
+# Returns the last path of a filename
#
-# Params: Filemode as number
+# Params: Path
#
-# Return: Filemode as readable string
+# Return: Last part of the path
-sub filemode($)
+sub file_name($)
{
- my ($modestring, $ur, $uw, $ux, $gr, $gw, $gx, $or, $ow, $ox);
- my $mode = shift;
-
- $ur = ($mode & 0400) ? "r" : "-"; # User Read
- $uw = ($mode & 0200) ? "w" : "-"; # User Write
- $ux = ($mode & 0100) ? "x" : "-"; # User eXecute
- $gr = ($mode & 0040) ? "r" : "-"; # Group Read
- $gw = ($mode & 0020) ? "w" : "-"; # Group Write
- $gx = ($mode & 0010) ? "x" : "-"; # Group eXecute
- $or = ($mode & 0004) ? "r" : "-"; # Other Read
- $ow = ($mode & 0002) ? "w" : "-"; # Other Write
- $ox = ($mode & 0001) ? "x" : "-"; # Other eXecute
-
- # build a readable mode string (rwxrwxrwx)
- return $ur . $uw . $ux . $gr . $gw . $gx . $or . $ow . $ox;
+ my $path = shift;
+ $path =~ tr!\\!/!;
+
+ unless($path eq "/")
+ {
+ $path = substr($path,0,-1) if($path =~ m!/$!);
+ $path = substr($path,rindex($path,"/")+1);
+ }
+
+ return $path;
}
# upper_path()
git.p6c8.net / devedit.git / commitdiff