- Check if the CGI module was able to create a valid handle for a file upload

[devedit.git] / modules / Config / DevEdit.pm

diff --git a/modules/Config/DevEdit.pm b/modules/Config/DevEdit.pm
index e423819f9d9f7361e9e7c7f79da9295b4959fc71..9b3cc6c1e560e3b06e3fa763c840ebb58217225f 100644 (file)
--- a/modules/Config/DevEdit.pm
+++ b/modules/Config/DevEdit.pm
@@ -5,8 +5,8 @@ package Config::DevEdit;
 #
 # Read and parse the configuration files
 #
 #
 # Read and parse the configuration files
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-04-25
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-31

 #
 
 use strict;
 #
 
 use strict;


@@ -24,7 +24,7 @@ use base qw(Exporter);
 #
 # Read the configuration files of Dev-Editor
 #
 #
 # Read the configuration files of Dev-Editor
 #

-# Params: Path to configuration file
+# Params: Path to main configuration file

 #
 # Return: Configuration (Hash Reference)
 
 #
 # Return: Configuration (Hash Reference)
 


@@ -42,7 +42,7 @@ sub read_config($)
 
 # parse_config()
 #
 
 # parse_config()
 #

-# Parse an INI-style configuration file
+# Parse a configuration file

 #
 # Params: Path to configuration file
 #
 #
 # Params: Path to configuration file
 #


@@ -53,7 +53,7 @@ sub parse_config($)
  my $file = shift;
  local *CF;
 
  my $file = shift;
  local *CF;
 

- open(CF,"<$file") or croak("Open $file: $!");
+ open(CF,"<".$file) or croak("Open $file: $!");

  read(CF, my $data, -s $file);
  close(CF);
 
  read(CF, my $data, -s $file);
  close(CF);
 


@@ -63,16 +63,16 @@ sub parse_config($)
  foreach my $line(@lines)
  {
   next if($line =~ /^\s*#/);
  foreach my $line(@lines)
  {
   next if($line =~ /^\s*#/);

-  next if($line !~ /^.+=.+$/);
+  next if($line !~ /^\s*\S+\s*=.+$/);

 
   my ($key,$value) = split(/=/,$line,2);
 
   # Remove whitespaces at the beginning and at the end
 
 
   my ($key,$value) = split(/=/,$line,2);
 
   # Remove whitespaces at the beginning and at the end
 

-  $key   =~ s/^\s*//g;
-  $key   =~ s/\s*$//g;
-  $value =~ s/^\s*//g;
-  $value =~ s/\s*$//g;
+  $key   =~ s/^\s+//g;
+  $key   =~ s/\s+$//g;
+  $value =~ s/^\s+//g;
+  $value =~ s/\s+$//g;

 
   croak "Double defined value '$key' in configuration file '$file'" if($config->{$key});
 
 
   croak "Double defined value '$key' in configuration file '$file'" if($config->{$key});