copyright holders modified

[selfforum.git] / selfforum-cgi / shared / Conf.pm

diff --git a/selfforum-cgi/shared/Conf.pm b/selfforum-cgi/shared/Conf.pm
index 1fa97b2379fd9fe44d82b4b77897b864a66a0ee6..b67599568d79dba92359e358ea8c6d27caf221a5 100644 (file)
--- a/selfforum-cgi/shared/Conf.pm
+++ b/selfforum-cgi/shared/Conf.pm
@@ -12,17 +12,14 @@ use strict;
 
 package Conf;
 
-use vars qw(@ISA @EXPORT);
-
 use XML::DOM;
 
 # ====================================================
 # Funktionsexport
 # ====================================================
 
-require Exporter;
-@ISA    = qw(Exporter);
-@EXPORT = qw(read_script_conf);
+use base qw(Exporter);
+@Conf::EXPORT = qw(read_script_conf);
 
 ################################
 # sub read_script_conf
@@ -31,12 +28,12 @@ require Exporter;
 ################################
 
 sub read_script_conf ($$$) {
-  my ($Bin, $Shared, $Script) = @_;
+  my ($Config, $Shared, $Script) = @_;
 
   $Script =~ s/^(.*)\..*$/$1/;             # Vornamen extrahieren
   my $common  = "$Shared/common.xml";      # gemeinsame Konf-datei
-  my $group   = "$Bin/config/common.xml";  # gemeinsame (Gruppen-)Konf-datei
-  my $special = "$Bin/config/$Script.xml"; # spezielle Konf-datei
+  my $group   = "$Config/common.xml";  # gemeinsame (Gruppen-)Konf-datei
+  my $special = "$Config/$Script.xml"; # spezielle Konf-datei
   my %conf=();                             # conf-Hash
 
   &parse_script_conf ($common , \%conf, $Script);   # und los...