Überflüssige globale Variablen entfernt.

Bzw. die "my $menufile" aus den verschiedenen Menüscripten in eine
einzige globale Variable verschoben.

Conflicts:

	bin/mozilla/menu.pl

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 3b64e48c3b82ed7c58fc6a87c8841555ff41473e..7e195b486bdc7aaaaae592f22bf09569f19952d2 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -70,6 +70,7 @@ sub pre_startup_setup {
     $::userspath  = "users";
     $::templates  = "templates";
     $::memberfile = "users/members";
     $::userspath  = "users";
     $::templates  = "templates";
     $::memberfile = "users/members";

+    $::menufile   = "menu.ini";

     $::sendmail   = "| /usr/sbin/sendmail -t";
     $::lxdebug    = LXDebug->new;
     $::auth       = SL::Auth->new;
     $::sendmail   = "| /usr/sbin/sendmail -t";
     $::lxdebug    = LXDebug->new;
     $::auth       = SL::Auth->new;

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index e350cb3428d15dc31ffecad57b854f40d6979682..d5e8d3a0e43ad374cf29fdcf5c0ec8fcb797785f 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -48,8 +48,6 @@ require "bin/mozilla/reportgenerator.pl";
 
 use strict;
 
 
 use strict;
 

-my $print_post;
-

 1;
 
 # end of main
 1;
 
 # end of main


@@ -905,8 +903,6 @@ sub e_mail {
 
   $form->{print_and_save} = 1;
 
 
   $form->{print_and_save} = 1;
 

-  $print_post = 1;
-

   my $saved_form = save_form();
 
   save();
   my $saved_form = save_form();
 
   save();

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 2495d07cbf026bc45acad1fda036d960326c81df..4a46026fe6cccb4923d62bc8437f190c2dae2dc3 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -84,7 +84,7 @@ sub acc_menu {
 
   $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
 
   $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;

-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new($::menufile);

 
   $form->{title} = $locale->text('Accounting Menu');
 
 
   $form->{title} = $locale->text('Accounting Menu');
 

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index b79d605fd93843d0324d3914f89ef5ff9a40f9dd..e2c8270ebc8b9428750920bbe5194a28c8462d23 100644 (file)
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -36,7 +36,6 @@
 #  2007-10-14 - XMLified  - Holger Will  <holger@treebuilder.de>
 #######################################################################
 
 #  2007-10-14 - XMLified  - Holger Will  <holger@treebuilder.de>
 #######################################################################
 

-my $menufile = "menu.ini";

 use SL::Menu;
 
 use CGI::Carp qw(fatalsToBrowser);
 use SL::Menu;
 
 use CGI::Carp qw(fatalsToBrowser);


@@ -98,7 +97,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;

-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new($::menufile);

 
   $| = 1;
 
 
   $| = 1;
 

diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl
index af60595c8d8e7de851005dd5bd32a7f170bf98a0..7cc5926710ea416ec95a8883df13505762f40a78 100644 (file)
--- a/bin/mozilla/menujs.pl
+++ b/bin/mozilla/menujs.pl
@@ -35,7 +35,6 @@
 #  2004-12-14 - Holger Lindemann
 #######################################################################
 
 #  2004-12-14 - Holger Lindemann
 #######################################################################
 

-my $menufile = "menu.ini";

 use SL::Menu;
 use CGI::Carp qw(fatalsToBrowser);
 
 use SL::Menu;
 use CGI::Carp qw(fatalsToBrowser);
 


@@ -136,7 +135,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;

-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new($::menufile);

 
   $| = 1;
 
 
   $| = 1;
 

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index 49adcefa13dde203f80ea22403f9730cde36d6f7..e35a51e078c646c9f1a13f15987aed1c08591ec5 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -37,8 +37,6 @@ use URI;
 
 use strict;
 
 
 use strict;
 

-my $menufile = "menu.ini";
-

 1;
 
 # end of main
 1;
 
 # end of main


@@ -87,7 +85,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;

-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new($::menufile);

 
   $| = 1;
 
 
   $| = 1;
 

diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl
index 5459f6e8ac8a16628c6d048fbca5e1e7b816352b..56d734728e44e42ddbb606dab5bcc066b65a7e15 100644 (file)
--- a/bin/mozilla/menuv4.pl
+++ b/bin/mozilla/menuv4.pl
@@ -37,8 +37,6 @@ use URI;
 
 use strict;
 
 
 use strict;
 

-my $menufile = "menu.ini";
-

 1;
 
 # end of main
 1;
 
 # end of main


@@ -89,7 +87,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;

-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new($::menufile);

 
   $| = 1;
 
 
   $| = 1;
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index cd04c6b272928b3a6336f5ed3decd27478266f1e..a2085f6a02a46cee0390fc8de8b9542aeabb2225 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -50,7 +50,6 @@ require "bin/mozilla/reportgenerator.pl";
 
 use strict;
 
 
 use strict;
 

-my $print_post;

 our %TMPL_VAR;
 
 1;
 our %TMPL_VAR;
 
 1;


@@ -1858,8 +1857,6 @@ sub e_mail {
 
   $form->{print_and_save} = 1;
 
 
   $form->{print_and_save} = 1;
 

-  $print_post = 1;
-

   my $saved_form = save_form();
 
   save();
   my $saved_form = save_form();
 
   save();