From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 7 Sep 2009 09:26:12 +0000 (+0200)
Subject: Regex korrekt escapen und Debugmeldungen.
X-Git-Tag: release-2.6.1beta1~290
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=31b977d60bf4b65b265b4d742b433ffea855d540;hp=f20785168580f2d3587ebb2d06ade189246fd5f3;p=kivitendo-erp.git

Regex korrekt escapen und Debugmeldungen.
---

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index fbf3b2c05..a8b46973a 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -51,7 +51,7 @@ sub display {
 
   my $callback   = $form->unescape($form->{callback});
   $callback      = URI->new($callback)->rel($callback) if $callback;
-  $callback      = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
+  $callback      = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 
   $form->header;
 
diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index 83310da11..8f2223b47 100644
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -51,7 +51,7 @@ sub display {
   my $charset = $dbcharset || 'ISO-8859-1';
   my $callback            = $form->unescape($form->{callback});
   $callback               = URI->new($callback)->rel($callback) if $callback;
-  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
+  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 
   my $text    = $form->create_http_response('content_type' => 'text/xml',
                                             'charset'      => $charset)
diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index b48abc814..5002b1b91 100644
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -52,7 +52,7 @@ sub display {
   $form->{menu_items}     = acc_menu();
   my $callback            = $form->unescape($form->{callback});
   $callback               = URI->new($callback)->rel($callback) if $callback;
-  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
+  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
   $form->{callback}       = $callback;
 
   print $form->parse_html_template("menu/menunew");
diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index 31aadf9e7..14753f2c4 100644
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -47,7 +47,7 @@ sub display {
   $form->{menu}     = acc_menu();
   my $callback      = $form->unescape($form->{callback});
   $callback         = URI->new($callback)->rel($callback) if $callback;
-  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
+  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
   $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv3");
diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl
index 0ff4f4b00..e20c8336a 100644
--- a/bin/mozilla/menuv4.pl
+++ b/bin/mozilla/menuv4.pl
@@ -46,11 +46,8 @@ sub display {
   $form->{date}     = clock_line();
   $form->{menu}     = acc_menu();
   my $callback      = $form->unescape($form->{callback});
-  $main::lxdebug->message(0, ">>>>>  $callback");
   $callback         = URI->new($callback)->rel($callback) if $callback;
-  $main::lxdebug->message(0, ">>>>>  $callback");
-  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
-  $main::lxdebug->message(0, ">>>>>  $callback");
+  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
   $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv4");