X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/c752deb389730ae56c25888e6b82c89e30060ec9..1ffd7f98c787b767995479114622399c6cb51801:/devedit.pl?ds=sidebyside diff --git a/devedit.pl b/devedit.pl index d9e146e..eb03292 100644 --- a/devedit.pl +++ b/devedit.pl @@ -1,12 +1,12 @@ #!C:/Programme/Perl/bin/perl.exe -w # -# Dev-Editor 2.1a +# Dev-Editor 2.3 # # Dev-Editor's main program # # Author: Patrick Canterino -# Last modified: 2004-11-26 +# Last modified: 2005-01-06 # use strict; @@ -23,7 +23,7 @@ use Command; use Output; use Tool; -$VERSION = '2.1a'; +$VERSION = '2.3'; # Path to configuration file # Change if necessary! @@ -53,7 +53,6 @@ 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 = ''; @@ -61,7 +60,7 @@ my $new_virtual = ''; 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... @@ -70,16 +69,16 @@ if($newfile ne '' && $newfile !~ /^\s+$/) # ... check if the directory exists ... - unless(-d clean_path($config->{'fileroot'}."/".$dir)) + unless(-d clean_path($config->{'fileroot'}.'/'.$dir)) { - abort($config->{'errors'}->{'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->{'errors'}->{'create_ar'},"/"); + abort($config->{'errors'}->{'create_ar'},'/'); } # Check if we have enough permissions to create a file @@ -87,18 +86,18 @@ if($newfile ne '' && $newfile !~ /^\s+$/) unless(-r $new_physical && -w $new_physical && -x $new_physical) { - abort($config->{'errors'}->{'dir_no_create'},"/",{DIR => $new_virtual}); + 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 -if(-e clean_path($config->{'fileroot'}."/".$file)) +if(-e clean_path($config->{'fileroot'}.'/'.$file)) { if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file)) { @@ -108,7 +107,7 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) lockfile => $config->{'lock_file'}, timeout => $config->{'lock_timeout'}); - $uselist->lock or abort($config->{'errors'}->{'lock_failed'},undef,{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 @@ -130,12 +129,12 @@ if(-e clean_path($config->{'fileroot'}."/".$file)) } else { - abort($config->{'errors'}->{'above_root'},"/"); + abort($config->{'errors'}->{'above_root'},'/'); } } else { - abort($config->{'errors'}->{'not_exist'},"/"); + abort($config->{'errors'}->{'not_exist'},'/'); } #