Filehandles als lokal deklarieren; Kosmetik; Argumente für open() nicht aus $form...

diff --git a/SL/Inifile.pm b/SL/Inifile.pm
index 8ec3e80bde517b50c52f9a4c392355543b71ff01..eae4f49e46ea62d8e26ed4600ca2ea6431274344 100644 (file)
--- a/SL/Inifile.pm
+++ b/SL/Inifile.pm
@@ -43,6 +43,8 @@ sub new {
   my $id = "";
   my $skip;
 
+  local *FH;
+
   $type = ref($self) || $self;
 
   open FH, "$file" or Form->error("$file : $!");

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 3da92a906b0b683553b8bc0429b108073558b641..fe2c731da6f7116ff0e2891b7bc680c336633ac8 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -72,9 +72,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $form->{title} = $locale->text('Accounting Menu');
 

diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index b0b46e8c321c0b8907177d75bc6caf8fa431b31d..be6522181609d842a6065e6613865b2542c4234b 100644 (file)
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -126,9 +126,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $| = 1;
 

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index c9a3d541d6770447327131ca02bcdae83bbc2973..4ad56bd5e8f9b1d2f447eeadd75df61085f7ffc2 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -133,9 +133,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $| = 1;