X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/432cbc70862e1bf6ed058dfe75be03160ceea09f..5abe8188abba8d1d5931b84d36d719c7ef3aee36:/modules/Config/DevEdit.pm?ds=inline diff --git a/modules/Config/DevEdit.pm b/modules/Config/DevEdit.pm index b4cb963..24bc3a2 100644 --- 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 -# Last modified: 2005-09-30 +# Last modified: 2010-12-23 # # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann # Copyright (C) 2003-2009 Patrick Canterino @@ -30,6 +30,13 @@ use base qw(Exporter); @EXPORT = qw(read_config); +# This variable contains some dependencies for the "disable_commands" +# configuration option. +# 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'); + # read_config() # # Read the configuration files of Dev-Editor @@ -74,14 +81,15 @@ sub read_config($) 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->{'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->{'forbidden'} = $new_conf->{'forbidden'} if(defined $new_conf->{'forbidden'}); + $config->{'disable_commands'} = $new_conf->{'disable_commands'} if(defined $new_conf->{'disable_commands'}); - $config->{'hide_dot_files'} = $new_conf->{'hide_dot_files'} if(defined $new_conf->{'hide_dot_files'}); + $config->{'hide_dot_files'} = $new_conf->{'hide_dot_files'} if(defined $new_conf->{'hide_dot_files'}); - $config->{'user_config'} = 1; + $config->{'user_config'} = 1; } } @@ -108,6 +116,36 @@ sub read_config($) $config->{'forbidden'} = []; } + # Parse list of disabled commands (we need some universal code!) + + if($config->{'disable_commands'}) + { + my @commands; + + foreach my $command(parse_line('\s+',0,$config->{'disable_commands'})) + { + push(@commands,$command); + + if(exists($disable_dependency{$command}) && $disable_dependency{$command}) + { + if(ref($disable_dependency{$command}) eq 'ARRAY') + { + push(@commands,@{$disable_dependency{$command}}); + } + else + { + push(@commands,$disable_dependency{$command}); + } + } + } + + $config->{'disable_commands'} = \@commands; + } + else + { + $config->{'disable_commands'} = []; + } + return $config; }