Added new configuration option "startdir" which defines the default directory

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

diff --git a/modules/Config/DevEdit.pm b/modules/Config/DevEdit.pm
index 24bc3a2e39186850deafbd1b506eea8a60bcacfb..9b535c2649c16f19661e002ecc1132afa436de2b 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>
-# Last modified: 2010-12-23
+# Last modified: 2010-12-24
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
@@ -35,7 +35,9 @@ use base qw(Exporter);
 # The Hash key defines a command, the value is an Array Reference or String
 # defining the commands that will also be disabled.
 
-my %disable_dependency = ('beginedit' => 'endedit');
+my %disable_dependency = ('beginedit' => 'endedit',
+                          'remove' => 'remove_multi',
+                          '@write' => ['beginedit','endedit','copy','rename','remove','remove_multi','mkdir','mkfile','upload','chprop']);
 
 # read_config()
 #
@@ -83,6 +85,7 @@ sub read_config($)
 
    $config->{'fileroot'}         = $new_conf->{'fileroot'}  if($new_conf->{'fileroot'});
    $config->{'httproot'}         = $new_conf->{'httproot'}  if($new_conf->{'httproot'});
+   $config->{'startdir'}         = $new_conf->{'startdir'}  if($new_conf->{'startdir'});
 
    $config->{'forbidden'}        = $new_conf->{'forbidden'} if(defined $new_conf->{'forbidden'});
    $config->{'disable_commands'} = $new_conf->{'disable_commands'} if(defined $new_conf->{'disable_commands'});
@@ -124,7 +127,7 @@ sub read_config($)
 
   foreach my $command(parse_line('\s+',0,$config->{'disable_commands'}))
   {
-   push(@commands,$command);
+   push(@commands,$command) unless(substr($command,0,1) eq '@');
 
    if(exists($disable_dependency{$command}) && $disable_dependency{$command})
    {