From af0085b83ecb257679c8c64324521f9515ae76b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Thu, 16 Jul 2015 13:02:17 +0200
Subject: [PATCH] Menu: Caching und access korrekt clearen

---
 SL/Menu.pm | 59 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 1ecb52fab..ccfc32c96 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -12,37 +12,46 @@ BEGIN {
    $yaml_xs =  eval { require YAML::XS };
 }
 
+our %menu_cache;
+
 sub new {
   my ($package, $domain) = @_;
 
-  my $path = File::Spec->catdir('menus', $domain);
+  if (!$menu_cache{$domain}) {
+    my $path = File::Spec->catdir('menus', $domain);
 
-  opendir my $dir, $path or die "can't open $path: $!";
-  my @files = sort grep -f "$path/$_", readdir $dir;
-  close $dir;
+    opendir my $dir, $path or die "can't open $path: $!";
+    my @files = sort grep -f "$path/$_", readdir $dir;
+    close $dir;
 
-  my $nodes = [];
-  my $nodes_by_id = {};
-  for my $file (@files) {
-    my $data;
-    if ($yaml_xs) {
-      $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
-    } else {
-      $data = YAML::LoadFile(File::Spec->catfile($path, $file));
+    my $nodes = [];
+    my $nodes_by_id = {};
+    for my $file (@files) {
+      my $data;
+      if ($yaml_xs) {
+        $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
+      } else {
+        $data = YAML::LoadFile(File::Spec->catfile($path, $file));
+      }
+      _merge($nodes, $nodes_by_id, $data);
     }
-    _merge($nodes, $nodes_by_id, $data);
-  }
 
 
-  my $self = bless {
-    nodes => $nodes,
-    by_id => $nodes_by_id,
-  }, $package;
+    my $self = bless {
+      nodes => $nodes,
+      by_id => $nodes_by_id,
+    }, $package;
+
+    $self->build_tree;
 
-  $self->build_tree;
-  $self->set_access;
+    $menu_cache{$domain} = $self;
+  } else {
+    $menu_cache{$domain}->clear_access;
+  }
+
+  $menu_cache{$domain}->set_access;
 
-  return $self;
+  return $menu_cache{$domain};
 }
 
 sub _merge {
@@ -211,6 +220,14 @@ sub parse_instance_conf_string {
   return $::instance_conf->data->{$setting};
 }
 
+sub clear_access {
+  my ($self) = @_;
+  for my $node ($self->tree_walk("all")) {
+    delete $node->{visible};
+    delete $node->{visible_children};
+  }
+}
+
 sub set_access {
   my ($self) = @_;
   # 1. evaluate access for all
-- 
2.20.1