X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/5dc063ebfce6e78b69fa41bb4a2475fd726ee728..49d3533bb98307db019d423a7fd070f29c9cb7ee:/devedit.pl diff --git a/devedit.pl b/devedit.pl index 543d220..fc49a71 100644 --- a/devedit.pl +++ b/devedit.pl @@ -1,12 +1,12 @@ #!C:/Programme/Perl/bin/perl.exe -w # -# Dev-Editor 2.0 (CVS) +# Dev-Editor 2.3.1 # # Dev-Editor's main program # -# Author: Patrick Canterino -# Last modified: 2004-03-06 +# Author: Patrick Canterino +# Last modified: 2005-02-19 # use strict; @@ -23,14 +23,25 @@ use Command; use Output; use Tool; -$VERSION = '2.0 (CVS)'; +$VERSION = '2.3.1'; + +# Path to configuration file +# Change if necessary! use constant CONFIGFILE => 'devedit.dat'; # Read the configuration file my $config = read_config(CONFIGFILE); -error_template($config->{'tpl_error'}); # Yes, I'm lazy... +error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy... + +# Check if the root directory exists + +abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'} && not -l $config->{'fileroot'}); + +# 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 @@ -42,15 +53,14 @@ 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); + my $path = $curdir.'/'.$newfile; # Extract file and directory name... @@ -59,27 +69,39 @@ if($newfile ne '') # ... check if the directory exists ... - unless(-d clean_path($config->{'fileroot'}."/".$dir)) + my $temp_path = clean_path($config->{'fileroot'}.'/'.$dir); + + unless(-d $temp_path && not -l $temp_path) { - abort($config->{'err_dir_not_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)) { - abort($config->{'err_create_ar'}); + 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 - $new_physical = File::Spec->canonpath($new_physical."/".$file); + $new_physical = File::Spec->canonpath($new_physical.'/'.$file); $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)) +my $temp_path = clean_path($config->{'fileroot'}.'/'.$file); + +if(-e $temp_path || -l $temp_path) { if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file)) { @@ -89,11 +111,11 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) lockfile => $config->{'lock_file'}, timeout => $config->{'lock_timeout'}); - $uselist->lock or abort($config->{'err_lock_failed'},{USELIST => $config->{'uselist_file'}, 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 - # (some other necessary information will also be included) + # Create a hash containing data submitted by the user + # (some other necessary information are also included) my %data = (physical => $physical, virtual => $virtual, @@ -104,19 +126,23 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) version => $VERSION, configfile => CONFIGFILE); - my $output = exec_command($command,\%data,$config); # Execute the command... + # Execute the command... + + my $output = exec_command($command,\%data,$config); + + # ... unlock the list with files in use and show the output of the command - $uselist->unlock; # ... unlock the list with files in use... - print $$output; # ... and print the output of the command + $uselist->unlock or abort($config->{'errors'}->{'unlock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}}); + print $$output; } else { - abort($config->{'err_above_root'}); + abort($config->{'errors'}->{'above_root'},'/'); } } else { - abort($config->{'err_not_exist'}); + abort($config->{'errors'}->{'not_exist'},'/'); } #