Mention Artistic License 2.0 in README

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

diff --git a/modules/Config/DevEdit.pm b/modules/Config/DevEdit.pm
index b4cb963f17bbf090ea4c1049ff2ea9b57cca223e..145e2c7232d8d2181e444f0a59b164fd5089278d 100644 (file)
--- a/modules/Config/DevEdit.pm
+++ b/modules/Config/DevEdit.pm
@@ -6,14 +6,14 @@ 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-09-30
+# Last modified: 2011-02-11

 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann

-# Copyright (C) 2003-2009 Patrick Canterino
+# Copyright (C) 2003-2011 Patrick Canterino

 # All Rights Reserved.
 #
 # This file can be distributed and/or modified under the terms of
 # All Rights Reserved.
 #
 # This file can be distributed and/or modified under the terms of

-# of the Artistic License 1.0 (see also the LICENSE file found at
+# of the Artistic License 2.0 (see also the LICENSE file found at

 # the top level of the Dev-Editor distribution).
 #
 
 # the top level of the Dev-Editor distribution).
 #
 


@@ -30,6 +30,15 @@ use base qw(Exporter);
 
 @EXPORT = qw(read_config);
 
 
 @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',
+                          'remove' => 'remove_multi',
+                          '@write' => ['beginedit','endedit','copy','rename','remove','remove_multi','mkdir','mkfile','upload','chprop']);
+

 # read_config()
 #
 # Read the configuration files of Dev-Editor
 # read_config()
 #
 # Read the configuration files of Dev-Editor


@@ -74,14 +83,16 @@ sub read_config($)
 
    my $new_conf = $userconf->{$ENV{'REMOTE_USER'}};
 
 
    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->{'startdir'}         = $new_conf->{'startdir'}  if($new_conf->{'startdir'});

 
 

-   $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 +119,36 @@ sub read_config($)
   $config->{'forbidden'} = [];
  }
 
   $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) unless(substr($command,0,1) eq '@');
+
+   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;
 }
 
  return $config;
 }