When parsing a configuration file, ignore lines like that:

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 2c46f85f1884ee55e4f3f6541fae3ab7bb4534b5..94c9f0e968382051140e5add1be7d65a6e932344 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,39 +1,47 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor 1.1
+# Dev-Editor 2.2a

 #
 # Dev-Editor's main program
 #
 #
 # Dev-Editor's main program
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2003-12-02
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-29

 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 

-use vars qw(%config);
-
+use vars qw($VERSION);

 use lib 'modules';
 
 use CGI;
 use lib 'modules';
 
 use CGI;

-use Command;
+use Config::DevEdit;

 use File::UseList;
 use File::UseList;

+
+use Command;

 use Output;
 use Tool;
 
 use Output;
 use Tool;
 

-### Settings ###
+$VERSION = '2.2a';
+
+# Path to configuration file
+# Change if necessary!
+
+use constant CONFIGFILE => 'devedit.dat';
+
+# Read the configuration file

 
 

-%config = (
-           fileroot     => 'D:/Server/WWW/dokumente/devedit-test',
-           httproot     => '/devedit-test/',
-           timeformat   => '%d.%m.%Y %H:%M',
-           uselist_file => 'uselist',
-           lock_file    => 'uselist.lock',
-           lock_timeout => '10'
-          );
+my $config = read_config(CONFIGFILE);
+error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...

 
 

-### End Settings ###
+# Check if the root directory exists
+
+abort($config->{'errors'}->{'no_root_dir'}) unless(-d $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
 
 
 # Read the most important form data
 


@@ -45,12 +53,11 @@ my $curdir  = $cgi->param('curdir')  || '';
 my $newfile = $cgi->param('newfile') || '';
 
 # Create physical and virtual path for the new file
 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  = '';
 
 
 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);
 {
  $curdir  = upper_path($file) if($curdir eq '');
  my $path = clean_path($curdir.$newfile);


@@ -62,16 +69,24 @@ if($newfile ne '')
 
  # ... check if the directory exists ...
 
 
  # ... 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
 
  }
 
  # ... 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($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("You aren't allowed to create files and directories above the virtual root directory.");
+  abort($config->{'errors'}->{'dir_no_create'},"/",{DIR => $new_virtual});

  }
 
  # Create the physical and the virtual path
  }
 
  # Create the physical and the virtual path


@@ -80,44 +95,46 @@ if($newfile ne '')
  $new_virtual .= $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))
+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))

  {
   # Create a File::UseList object and load the list
 
  {
   # 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
   $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,
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,
               uselist      => $uselist,

-              cgi          => $cgi);
+              cgi          => $cgi,
+              version      => $VERSION,
+              configfile   => CONFIGFILE);

 
 

-  my $output = exec_command($command,\%data,\%config); # Execute the command...
+  my $output = exec_command($command,\%data,$config); # Execute the command...

 
   $uselist->unlock; # ... unlock the list with files in use...
 
   $uselist->unlock; # ... unlock the list with files in use...

-  print $$output;   # ... and print the output of the command
+  print $$output;   # ... and show the output of the command

  }
  else
  {
  }
  else
  {

-  abort("Accessing files and directories above the virtual root directory is forbidden.");
+  abort($config->{'errors'}->{'above_root'},"/");

  }
 }
 else
 {
  }
 }
 else
 {

- abort("File/directory does not exist.");
+ abort($config->{'errors'}->{'not_exist'},"/");

 }
 
 #
 }
 
 #