projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7288950
)
warnings
author
Sven Schöling
<s.schoeling@linet-services.de>
Fri, 1 Feb 2013 13:25:53 +0000
(14:25 +0100)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Fri, 1 Feb 2013 13:25:53 +0000
(14:25 +0100)
SL/Form.pm
patch
|
blob
|
history
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
c6fd574
..
94d3c56
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-380,9
+380,10
@@
sub _get_request_uri {
my $self = shift;
return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
my $self = shift;
return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
+ return URI->new if !$ENV{REQUEST_URI}; # for testing
my $scheme = $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
my $scheme = $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
- my $port = $ENV{SERVER_PORT}
|| ''
;
+ my $port = $ENV{SERVER_PORT};
$port = undef if (($scheme eq 'http' ) && ($port == 80))
|| (($scheme eq 'https') && ($port == 443));
$port = undef if (($scheme eq 'http' ) && ($port == 80))
|| (($scheme eq 'https') && ($port == 443));
@@
-479,7
+480,7
@@
sub header {
);
$self->{favicon} ||= "favicon.ico";
);
$self->{favicon} ||= "favicon.ico";
- $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title};
+ $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title}
|| !$self->{titlebar}
;
# build includes
if ($self->{refresh_url} || $self->{refresh_time}) {
# build includes
if ($self->{refresh_url} || $self->{refresh_time}) {