X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/7cf8cb75f44d1e189cec159cf5c50fb14a13e85c..89269f652fc46e65006b9aead5eb1ae61ebc311e:/devedit.pl diff --git a/devedit.pl b/devedit.pl index 42e1d40..6f38e38 100644 --- a/devedit.pl +++ b/devedit.pl @@ -6,12 +6,15 @@ # Dev-Editor's main program # # Author: Patrick Canterino -# 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; @@ -20,17 +23,18 @@ use File::UseList; 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 ### @@ -40,6 +44,44 @@ my $cgi = new CGI; 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 @@ -53,11 +95,11 @@ if(-e clean_path($config{'fileroot'}."/".$file)) '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 ); @@ -68,16 +110,16 @@ if(-e clean_path($config{'fileroot'}."/".$file)) 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);