From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 3 Nov 2009 10:32:55 +0000 (+0100)
Subject: Einige strict Probleme mit vclimit=0
X-Git-Tag: release-2.6.1beta1~130
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=65df2ecc07d76c4714a5548ab6140852bc3abf07;p=kivitendo-erp.git

Einige strict Probleme mit vclimit=0
---

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 9fcf15374..b9ee83da0 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -63,46 +63,50 @@ sub menuitem {
 
   my ($self, $myconfig, $form, $item) = @_;
 
-  my $module = $form->{script};
-  my $action = "section_menu";
-  my $target = "";
+  my $module = $self->{$item}{module} || $form->{script};
+  my $action = $self->{$item}{action} || "section_menu";
+  my $target = $self->{$item}{target} || "";
 
-  if ($self->{$item}{module}) {
-    $module = $self->{$item}{module};
-  }
-  if ($self->{$item}{action}) {
-    $action = $self->{$item}{action};
-  }
-  if ($self->{$item}{target}) {
-    $target = $self->{$item}{target};
-  }
+  my $level  = $form->escape($item);
 
-  my $level = $form->escape($item);
+  my $style  = 'style="vertical-align:top"';
+  my $target_token = ($target)
+                   ? "target='$target'"
+                   : '';
 
-  my $str = qq|<a style="vertical-align:top" href=$module?action=$action&level=$level|;
+#  my $str = qq|<a style="vertical-align:top" href='|;
+  my $href = ($self->{$item}{href})
+           ? $form->escape($self->{$item}{href})
+           : "$module?action=$action&amp;level=$level";
 
-  my @vars = qw(module action target href);
+  my @vars = ($self->{$item}{href})
+           ? qw(module target href)
+           : qw(module action target href);
 
-  if ($self->{$item}{href}) {
-    $str  = qq|<a href=$self->{$item}{href}|;
-    @vars = qw(module target href);
-  }
+#  if ($self->{$item}{href}) {
+##    $str  = qq|<a 'href=$self->{$item}{href}|;
+#    @vars = qw(module target href);
+#  }
 
   map { delete $self->{$item}{$_} } @vars;
 
   # add other params
   foreach my $key (keys %{ $self->{$item} }) {
-    $str .= "&" . $form->escape($key, 1) . "=";
+    $href .= "&amp;" . $form->escape($key, 1) . "=";
     my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2);
     $value = $myconfig->{$value} . "/$conf" if ($conf);
-    $str .= $form->escape($value, 1);
+    $href .= $form->escape($value, 1);
   }
 
-  if ($target) {
-    $str .= qq| target=$target|;
-  }
+#  $str .= q|'|;
+#
+#  if ($target) {
+#    $str .= qq| target=$target|;
+#  }
 
-  $str .= ">";
+#  $str .= ">";
+
+  my $str = "<a href='$href' $target_token $style>";
 
   $main::lxdebug->leave_sub();
 
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 97f2dbad9..8f643e57e 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1213,7 +1213,7 @@ sub search {
   $form->all_vc(\%myconfig, "vendor", "AP");
 
   my $vendor;
-  if (@{ $form->{all_vendor} }) {
+  if (@{ $form->{all_vendor} || [] }) {
     map { $vendor .= "<option>$_->{name}--$_->{id}\n" }
       @{ $form->{all_vendor} };
     $vendor = qq|<select name=vendor><option>\n$vendor\n</select>|;
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index a285f5238..ced937e2b 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -173,7 +173,7 @@ sub create_links {
   map { $form->{selectcurrency} .= "<option>$_\n" } @curr;
 
   # customers
-  if (@{ $form->{all_customer} }) {
+  if (@{ $form->{all_customer} || [] }) {
     $form->{customer} = "$form->{customer}--$form->{customer_id}";
     map { $form->{selectcustomer} .= "<option>$_->{name}--$_->{id}\n" }
       (@{ $form->{all_customer} });
diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 10acafdaa..421667da8 100644
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -95,7 +95,7 @@ sub search {
   # setup customer/vendor selection
   BP->get_vc(\%myconfig, \%$form);
 
-  if (@{ $form->{"all_$form->{vc}"} }) {
+  if (@{ $form->{"all_$form->{vc}"} || [] }) {
     map { $name .= "<option>$_->{name}--$_->{id}\n" }
       @{ $form->{"all_$form->{vc}"} };
     $name = qq|<select name=$form->{vc}><option>\n$name</select>|;
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 116d16869..d844675b3 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -252,7 +252,7 @@ sub order_links {
   $form->{employee}    = "$form->{employee}--$form->{employee_id}";
 
   # build vendor/customer drop down comatibility... don't ask
-  if (@{ $form->{"all_$form->{vc}"} }) {
+  if (@{ $form->{"all_$form->{vc}"} || [] }) {
     $form->{"select$form->{vc}"} = 1;
     $form->{$form->{vc}}         = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
   }