Skip to content

Commit 95f13e9

Browse files
committed
Fixed missing ipdata in getVisitorIp function.
1 parent 201b614 commit 95f13e9

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

src/Database.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Database
1212
*
1313
* @var string
1414
*/
15-
public const VERSION = '9.5.2';
15+
public const VERSION = '9.5.3';
1616

1717
/**
1818
* Unsupported field message.

src/IpTools.php

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -300,31 +300,29 @@ public function getVisitorIp(&$ipData = null)
300300
}
301301
}
302302

303-
if (!empty($ipData)) {
304-
if (is_array($ipData)) {
305-
if ($ipRemoteAdd != '::1') {
306-
$ipData['REMOTE_ADDR'] = $ipRemoteAdd;
307-
}
308-
309-
if ($ipSucuri != '::1') {
310-
$ipData['HTTP_X_SUCURI_CLIENTIP'] = $ipSucuri;
311-
}
312-
313-
if ($ipIncap != '::1') {
314-
$ipData['HTTP_INCAP_CLIENT_IP'] = $ipIncap;
315-
}
316-
317-
if ($ipCf != '::1') {
318-
$ipData['HTTP_CF_CONNECTING_IP'] = $ipCf;
319-
}
320-
321-
if ($ipReal != '::1') {
322-
$ipData['HTTP_X_REAL_IP'] = $ipReal;
323-
}
324-
325-
if ($ipForwardedOri != '::1') {
326-
$ipData['HTTP_X_FORWARDED_FOR'] = $ipForwardedOri;
327-
}
303+
if ((is_array($ipData)) || ($ipData == null)) {
304+
if ($ipRemoteAdd != '::1') {
305+
$ipData['REMOTE_ADDR'] = $ipRemoteAdd;
306+
}
307+
308+
if ($ipSucuri != '::1') {
309+
$ipData['HTTP_X_SUCURI_CLIENTIP'] = $ipSucuri;
310+
}
311+
312+
if ($ipIncap != '::1') {
313+
$ipData['HTTP_INCAP_CLIENT_IP'] = $ipIncap;
314+
}
315+
316+
if ($ipCf != '::1') {
317+
$ipData['HTTP_CF_CONNECTING_IP'] = $ipCf;
318+
}
319+
320+
if ($ipReal != '::1') {
321+
$ipData['HTTP_X_REAL_IP'] = $ipReal;
322+
}
323+
324+
if ($ipForwardedOri != '::1') {
325+
$ipData['HTTP_X_FORWARDED_FOR'] = $ipForwardedOri;
328326
}
329327
}
330328

0 commit comments

Comments
 (0)