fix: sometimes address in "connections" panel was empty

This commit is contained in:
Massimo Melina 2020-05-24 17:56:32 +02:00
parent 8f1965f863
commit dd0fc4e448
2 changed files with 5 additions and 5 deletions

View File

@ -303,7 +303,7 @@ confirm=Are you sure?
{.$icons.css.} {.$icons.css.}
button { background-color: #bcd; color: #444; padding: .5em 1em; border: transparent; text-decoration: none; border-radius: .3em; vertical-align: middle; cursor:pointer; } button { background-color: #bcd; color: #444; padding: .5em 1em; border: transparent; text-decoration: none; border-radius: .3em; vertical-align: middle; cursor:pointer; }
body { font-family:tahoma, verdana, arial, helvetica, sans; transition:background-color 1s ease; } body { font-family:tahoma, verdana, arial, helvetica, sans; transition:background-color 1s ease; color:#777; }
a { text-decoration:none; color:#357; border:1px solid transparent; padding:0 0.1em; } a { text-decoration:none; color:#357; border:1px solid transparent; padding:0 0.1em; }
#folder-path { float:left; margin-bottom: 0.2em; } #folder-path { float:left; margin-bottom: 0.2em; }
#folder-path button { padding: .4em; } #folder-path button { padding: .4em; }
@ -311,7 +311,7 @@ a { text-decoration:none; color:#357; border:1px solid transparent; padding:0 0.
button i.fa { font-size:110% } button i.fa { font-size:110% }
.item { margin-bottom:.3em; padding:.3em .8em; border-top:1px solid #ddd; } .item { margin-bottom:.3em; padding:.3em .8em; border-top:1px solid #ddd; }
.item:hover { background:#f8f8f8; } .item:hover { background:#f8f8f8; }
.item-props { float:right; font-size:90%; margin-left:12px; color:#777; margin-top:.2em; } .item-props { float:right; font-size:90%; margin-left:12px; margin-top:.2em; }
.item-link { float:left; word-break:break-word; /* fix long names without spaces on mobile */ } .item-link { float:left; word-break:break-word; /* fix long names without spaces on mobile */ }
.item img { vertical-align: text-bottom; margin:0 0.2em; } .item img { vertical-align: text-bottom; margin:0 0.2em; }
.item .fa-lock { margin-right: 0.2em; } .item .fa-lock { margin-right: 0.2em; }

View File

@ -36,8 +36,8 @@ uses
HSlib, traylib, monoLib, progFrmLib, classesLib; HSlib, traylib, monoLib, progFrmLib, classesLib;
const const
VERSION = '2.4 beta2'; VERSION = '2.4 beta3';
VERSION_BUILD = '304'; VERSION_BUILD = '305';
VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF}; VERSION_STABLE = {$IFDEF STABLE } TRUE {$ELSE} FALSE {$ENDIF};
CURRENT_VFS_FORMAT :integer = 1; CURRENT_VFS_FORMAT :integer = 1;
CRLF = #13#10; CRLF = #13#10;
@ -5272,7 +5272,7 @@ var
if addressmatch(forwardedMask, conn.address) then if addressmatch(forwardedMask, conn.address) then
begin begin
data.address:=getTill(':', getTill(',', conn.getHeader('x-forwarded-for'))); data.address:=getTill(':', getTill(',', conn.getHeader('x-forwarded-for')));
if not checkAddressSyntax(data.address) then if not checkAddressSyntax(data.address, FALSE) then
data.address:=conn.address; data.address:=conn.address;
end; end;