- Now, Dev-Editor is able to switch some configuration values depending on the

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

diff --git a/modules/Config/DevEdit.pm b/modules/Config/DevEdit.pm
index c3875144039dc8e2def7206c67c8dfa9ea077c61..aa76b5ebbc190d1286453e81994569c8e0385ee3 100644 (file)
--- a/modules/Config/DevEdit.pm
+++ b/modules/Config/DevEdit.pm
@@ -6,7 +6,7 @@ package Config::DevEdit;
 # Read and parse the configuration files
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Read and parse the configuration files
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-06-09
+# Last modified: 2005-08-24

 #
 
 use strict;
 #
 
 use strict;


@@ -39,6 +39,28 @@ sub read_config($)
  $config->{'errors'}    = parse_config($config->{'error_file'});
  $config->{'templates'} = parse_config($config->{'template_file'});
 
  $config->{'errors'}    = parse_config($config->{'error_file'});
  $config->{'templates'} = parse_config($config->{'template_file'});
 

+ # Check if we have to parse the user config file
+
+ if($ENV{'REMOTE_USER'} && $config->{'userconf_file'} && -f $config->{'userconf_file'})
+ {
+  my $userconf = parse_config($config->{'userconf_file'});
+
+  if($userconf->{$ENV{'REMOTE_USER'}})
+  {
+   # The current HTTP Auth user has got an individual configuration
+   # Overwrite the default values
+
+   my $new_conf = $userconf->{$ENV{'REMOTE_USER'}};
+
+   $config->{'fileroot'}  = $new_conf->{'fileroot'}  if($new_conf->{'fileroot'});
+   $config->{'httproot'}  = $new_conf->{'httproot'}  if($new_conf->{'httproot'});
+
+   $config->{'forbidden'} = $new_conf->{'forbidden'} if(defined $new_conf->{'forbidden'});
+
+   $config->{'user_config'} = 1;
+  }
+ }
+

  # Parse list of forbidden files
 
  if($config->{'forbidden'})
  # Parse list of forbidden files
 
  if($config->{'forbidden'})


@@ -57,6 +79,10 @@ sub read_config($)
 
   $config->{'forbidden'} = \@files;
  }
 
   $config->{'forbidden'} = \@files;
  }

+ else
+ {
+  $config->{'forbidden'} = [];
+ }

 
  return $config;
 }
 
  return $config;
 }


@@ -81,26 +107,48 @@ sub parse_config($)
  my @lines  = split(/\015\012|\012|\015/,$data);
  my $config = {};
  my $count  = 0;
  my @lines  = split(/\015\012|\012|\015/,$data);
  my $config = {};
  my $count  = 0;

+ my $sect;

 
  foreach my $line(@lines)
  {
   $count++;
 
   next if($line =~ /^\s*#/);
 
  foreach my $line(@lines)
  {
   $count++;
 
   next if($line =~ /^\s*#/);

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

 
 

-  my ($key,$value) = split(/=/,$line,2);
+  if($line =~ /^\s*\[(\S+)\]\s*$/)
+  {
+   # Switch to new section
+
+   $sect = $1;
+  }
+  elsif($line =~ /^\s*\S+\s*=.*$/)
+  {
+   # A normal "key = value" line
+
+   my ($key,$value) = split(/=/,$line,2);
+
+   # Remove whitespaces at the beginning and at the end

 
 

-  # 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;
+   if($sect)
+   {
+    $config->{$sect} = {} if(ref($config->{$sect}) ne 'HASH');

 
 

-  croak "Configuration option '$key' defined twice in line $count of configuration file '$file'" if($config->{$key});
+    croak "Configuration option '$key' of section '$sect' defined twice in line $count of configuration file '$file'" if($config->{$sect}->{$key});

 
 

-  $config->{$key} = $value;
+    $config->{$sect}->{$key} = $value;
+   }
+   else
+   {
+    croak "Configuration option '$key' defined twice in line $count of configuration file '$file'" if($config->{$key});
+
+    $config->{$key} = $value;
+   }
+  }

  }
 
  return $config;
  }
 
  return $config;