X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/89269f652fc46e65006b9aead5eb1ae61ebc311e..6a4499d441793336945f8dd7aa4485ee0fafc1ee:/devedit.pl diff --git a/devedit.pl b/devedit.pl index 6f38e38..94c9f0e 100644 --- a/devedit.pl +++ b/devedit.pl @@ -1,42 +1,47 @@ #!C:/Programme/Perl/bin/perl.exe -w # -# Dev-Editor +# Dev-Editor 2.2a # # Dev-Editor's main program # -# Author: Patrick Canterino -# Last modified: 10-04-2003 +# Author: Patrick Canterino +# Last modified: 2004-12-29 # use strict; use CGI::Carp qw(fatalsToBrowser); -use vars qw($VERSION - %config); - +use vars qw($VERSION); use lib 'modules'; use CGI; -use Command; +use Config::DevEdit; use File::UseList; + +use Command; use Output; use Tool; -$VERSION = '1.0'; +$VERSION = '2.2a'; + +# Path to configuration file +# Change if necessary! + +use constant CONFIGFILE => 'devedit.dat'; + +# Read the configuration file + +my $config = read_config(CONFIGFILE); +error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy... -### Settings ### +# Check if the root directory exists -%config = ( - fileroot => 'D:/Server/WWW/dokumente', - httproot => '/', - timeformat => '%d.%m.%Y %H:%M', - uselist_file => 'uselist', - lock_file => 'uselist.lock', - lock_timeout => '10' - ); +abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'}); -### End Settings ### +# Check if we are able to access the root directory + +abort($config->{'errors'}->{'no_root_access'}) unless(-r $config->{'fileroot'} && -x $config->{'fileroot'}); # Read the most important form data @@ -48,12 +53,11 @@ 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 '') +if($newfile ne '' && $newfile !~ /^\s+$/) { $curdir = upper_path($file) if($curdir eq ''); my $path = clean_path($curdir.$newfile); @@ -65,16 +69,24 @@ if($newfile ne '') # ... check if the directory exists ... - unless(-d clean_path($config{'fileroot'}."/".$dir)) + unless(-d clean_path($config->{'fileroot'}."/".$dir)) { - abort("The directory where you want to create this file or directory doesn't exist."); + abort($config->{'errors'}->{'dir_not_exist'},"/"); } # ... and check if the path is above the root directory - unless(($new_physical,$new_virtual) = check_path($config{'fileroot'},$dir)) + 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."); + abort($config->{'errors'}->{'create_ar'},"/"); + } + + # Check if we have enough permissions to create a file + # in this directory + + unless(-r $new_physical && -w $new_physical && -x $new_physical) + { + abort($config->{'errors'}->{'dir_no_create'},"/",{DIR => $new_virtual}); } # Create the physical and the virtual path @@ -83,65 +95,46 @@ if($newfile ne '') $new_virtual .= $file; } -# This check has to be performed first, or abs_path() will be confused +# This check has to be performed first or abs_path() will be confused -if(-e clean_path($config{'fileroot'}."/".$file)) +if(-e clean_path($config->{'fileroot'}."/".$file)) { - if(my ($physical,$virtual) = check_path($config{'fileroot'},$file)) + if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file)) { - # Copied from old Dev-Editor (great idea) - - my %dispatch = ('show' => \&exec_show, - 'beginedit' => \&exec_beginedit, - 'canceledit' => \&exec_unlock, - 'endedit' => \&exec_endedit, - 'mkdir' => \&exec_mkdir, - 'mkfile' => \&exec_mkfile, - 'workwithfile' => \&exec_workwithfile, - 'copy' => \&exec_copy, - 'rename' => \&exec_rename, - 'remove' => \&exec_remove, - 'unlock' => \&exec_unlock - ); - # Create a File::UseList object and load the list - my $uselist = new File::UseList(listfile => $config{'uselist_file'}, - lockfile => $config{'lock_file'}, - timeout => $config{'lock_timeout'}); + my $uselist = new File::UseList(listfile => $config->{'uselist_file'}, + lockfile => $config->{'lock_file'}, + timeout => $config->{'lock_timeout'}); - $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->lock or abort($config->{'errors'}->{'lock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}}); $uselist->load; # Create a hash with data submitted by user - # (the CGI and the File::UseList object will also be included) + # (some other necessary information will also be included) my %data = (physical => $physical, virtual => $virtual, new_physical => $new_physical, new_virtual => $new_virtual, uselist => $uselist, - cgi => $cgi); - - unless($dispatch{$command}) - { - $uselist->unlock; - abort("Unknown command: $command"); - } + cgi => $cgi, + version => $VERSION, + configfile => CONFIGFILE); - my $output = &{$dispatch{$command}}(\%data,\%config); # Execute the command... + my $output = exec_command($command,\%data,$config); # Execute the command... - $uselist->unlock; # ... unlock the list with used files... - print $$output; # ... and print the output of the command + $uselist->unlock; # ... unlock the list with files in use... + print $$output; # ... and show the output of the command } else { - abort("Accessing files and directories above the virtual root directory is forbidden."); + abort($config->{'errors'}->{'above_root'},"/"); } } else { - abort("File/directory does not exist."); + abort($config->{'errors'}->{'not_exist'},"/"); } #