X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=08727ce3664c58941bc58fddef04e53860bf2817;hb=0e60202e4d9de0e0377e63fccc3a2f93e68bd24f;hp=534a05e6ef7903b2f569a2b64c893bf756ca8afa;hpb=b251cc22f355941217493073e124ba3878d5530f;p=kivitendo-erp.git

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 534a05e6e..08727ce36 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -3,43 +3,73 @@ package SL::Menu;
 use strict;
 
 use SL::Auth;
-use YAML::XS ();
+use YAML ();
 use File::Spec;
 use SL::MoreCommon qw(uri_encode);
 
+our $yaml_xs;
+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/$_", grep /\.yaml$/, readdir $dir;
+    close $dir;
+
+    my $nodes = [];
+    my $nodes_by_id = {};
+    for my $file (@files) {
+      my $data;
+      eval {
+        if ($yaml_xs) {
+          $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
+        } else {
+          $data = YAML::LoadFile(File::Spec->catfile($path, $file));
+        }
+        1;
+      } or do {
+        die "Error while parsing $file: $@";
+      };
+
+      # check if this file is internally consistent.
+      die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO get better diag to user
+
+      # in particular duplicate ids tend to come up as a user error when editing the menu files
+      #my %uniq_ids;
+      #$uniq_ids{$_->{id}}++ && die "Error in $file: duplicate id $_->{id}" for @$data;
+
+      _merge($nodes, $nodes_by_id, $data);
+    }
 
-  my $nodes = [];
-  my $nodes_by_id = {};
-  for my $file (@files) {
-    my $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
-    _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;
+  }
 
-  return $self;
+  $menu_cache{$domain}->set_access;
+
+  return $menu_cache{$domain};
 }
 
 sub _merge {
   my ($nodes, $by_id, $data) = @_;
 
-  die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO check this sooner, to get better diag to user
-
   for my $node (@$data) {
     my $id = $node->{id};
 
@@ -78,13 +108,13 @@ sub build_tree {
   # first, some sanity check. are all parents valid ids or empty?
   for my $node ($self->nodes) {
     next if !exists $node->{parent} || !$node->{parent} || $self->{by_id}->{$node->{id}};
-    die "menu: node $node->{id} has non-existant parent $node->{parent}";
+    die "menu: node $node->{id} has non-existent parent $node->{parent}";
   }
 
   my %by_parent;
   # order them by parent
   for my $node ($self->nodes) {
-    push @{ $by_parent{ $node->{parent} } //= [] }, $node;
+    push @{ $by_parent{ $node->{parent} // '' } //= [] }, $node;
   }
 
   my $tree = { };
@@ -150,7 +180,7 @@ sub parse_access_string {
     } elsif ($token eq ")") {
       pop @stack;
       if (!@stack) {
-        die "Error in menu.ini for entry $node->{id}: missing '('";
+        die "Error while parsing menu entry $node->{id}: missing '('";
       }
       $cur_ary = $stack[-1];
 
@@ -167,11 +197,11 @@ sub parse_access_string {
   }
 
   if ($access) {
-    die "Error in menu.ini for entry $node->{id}: unrecognized token at the start of '$access'\n";
+    die "Error while parsing menu entry $node->{id}: unrecognized token at the start of '$access'\n";
   }
 
   if (1 < scalar @stack) {
-    die "Error in menu.ini for entry $node->{id}: Missing ')'\n";
+    die "Error while parsing menu entry $node->{id}: Missing ')'\n";
   }
 
   return SL::Auth::evaluate_rights_ary($stack[0]);
@@ -201,6 +231,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