X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/d241beaca38f6cdb8eed359b3a3a9c5b8879aff6..192be0abe5fb17e24b17342407893bb2c7607d78:/devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 76dd3c4..65b9321 100644
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,20 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
-# Dev-Editor 3.0 (CVS)
+# Dev-Editor 3.1
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2005-04-16
+# 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;
@@ -22,7 +30,7 @@ use Command;
 use Output;
 use Tool;
 
-$VERSION = '3.0 (CVS)';
+$VERSION = '3.2-dev';
 
 # 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 $file    = $cgi->param('file')    || '/';
+my $file    = $cgi->param('file')    || $config->{'startdir'} || '/';
 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 = '';
@@ -58,7 +73,6 @@ my $new_virtual  = '';
 
 if($newfile ne '' && $newfile !~ /^\s+$/)
 {
- $curdir  = upper_path($file) if($curdir eq '');
  my $path = $curdir.'/'.$newfile;
 
  # Extract file and directory name...
@@ -87,13 +101,20 @@ 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 => encode_html($new_virtual)});
  }
 
  # Create the physical and the virtual path
 
  $new_physical = File::Spec->canonpath($new_physical.'/'.$file);
  $new_virtual .= $file;
+
+ # Check if accessing this file is forbidden
+
+ if(is_forbidden_file($config->{'forbidden'},$new_virtual))
+ {
+  abort($config->{'errors'}->{'forbidden_file'},'/');
+ }
 }
 
 # This check has to be performed first or abs_path() will be confused
@@ -104,24 +125,31 @@ if(-e $temp_path || -l $temp_path)
 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {
-  # Create a hash containing data submitted by the user
-  # (some other necessary information are also included)
-
-  my %data = (physical     => $physical,
-              virtual      => $virtual,
-              new_physical => $new_physical,
-              new_virtual  => $new_virtual,
-              cgi          => $cgi,
-              version      => $VERSION,
-              configfile   => CONFIGFILE);
-
-  # Execute the command...
-
-  my $output = exec_command($command,\%data,$config);
-
-  # ... and show its output
-
-  print $$output;
+  if(is_forbidden_file($config->{'forbidden'},$virtual))
+  {
+   abort($config->{'errors'}->{'forbidden_file'},'/');
+  }
+  else
+  {
+   # Create a hash containing data submitted by the user
+   # (some other necessary information are also included)
+
+   my %data = (physical     => $physical,
+               virtual      => $virtual,
+               new_physical => $new_physical,
+               new_virtual  => $new_virtual,
+               cgi          => $cgi,
+               version      => $VERSION,
+               configfile   => CONFIGFILE);
+
+   # Execute the command...
+
+   my $output = exec_command($command,\%data,$config);
+
+   # ... and show its output
+
+   print $$output;
+  }
  }
  else
  {