D'oh!

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index f6d59c9a58470f54c4c1e56e728f219e8eab37e5..00fee800ca0d3c098c16a6873c673b60b159a052 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,20 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor 3.0 (CVS)
+# Dev-Editor 3.2

 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-06-09
+# Last modified: 2011-02-11
+#
+# Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
+# Copyright (C) 2003-2011 Patrick Canterino
+# All Rights Reserved.
+#
+# This file can be distributed and/or modified under the terms of
+# of the Artistic License 2.0 (see also the LICENSE file found at
+# the top level of the Dev-Editor distribution).

 #
 
 use strict;
 #
 
 use strict;


@@ -22,7 +30,7 @@ use Command;
 use Output;
 use Tool;
 
 use Output;
 use Tool;
 

-$VERSION = '3.0 (CVS)';
+$VERSION = '3.2';

 
 # Path to configuration file
 # Change if necessary!
 
 # Path to configuration file
 # Change if necessary!


@@ -47,10 +55,17 @@ abort($config->{'errors'}->{'no_root_access'}) unless(-r $config->{'fileroot'} &
 my $cgi = new CGI;
 
 my $command = $cgi->param('command') || 'show';
 my $cgi = new CGI;
 
 my $command = $cgi->param('command') || 'show';

-my $file    = $cgi->param('file')    || '/';
+my $file    = $cgi->param('file')    || $config->{'startdir'} || '/';

 my $curdir  = $cgi->param('curdir')  || '';
 my $newfile = $cgi->param('newfile') || '';
 
 my $curdir  = $cgi->param('curdir')  || '';
 my $newfile = $cgi->param('newfile') || '';
 

+# Check if the command is disabled
+
+if(is_disabled_command($config->{'disable_commands'},$command))
+{
+ abort($config->{'errors'}->{'command_disabled'},'/',{COMMAND => encode_html($command)});
+}
+

 # Create physical and virtual path for the new file
 
 my $new_physical = '';
 # Create physical and virtual path for the new file
 
 my $new_physical = '';


@@ -58,7 +73,6 @@ my $new_virtual  = '';
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {

- $curdir  = upper_path($file) if($curdir eq '');

  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...
  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...


@@ -95,7 +109,7 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
  $new_physical = File::Spec->canonpath($new_physical.'/'.$file);
  $new_virtual .= $file;
 
  $new_physical = File::Spec->canonpath($new_physical.'/'.$file);
  $new_virtual .= $file;
 

- # Check if the file is denied by configuration
+ # Check if accessing this file is forbidden

 
  if(is_forbidden_file($config->{'forbidden'},$new_virtual))
  {
 
  if(is_forbidden_file($config->{'forbidden'},$new_virtual))
  {