@@ -57,9 +57,11 @@ |
||
| 57 | 57 | try |
| 58 | 58 | { |
| 59 | 59 | $this->validateAddress($ipAddress); |
| 60 | - if (strpos($ipAddress, ':') !== false) // IPv6 address |
|
| 60 | + if (strpos($ipAddress, ':') !== false) { |
|
| 61 | + // IPv6 address |
|
| 61 | 62 | { |
| 62 | 63 | $hex = unpack('H*hex', inet_pton($ipAddress)); |
| 64 | + } |
|
| 63 | 65 | $ipAddress = substr(preg_replace('/([A-f0-9]{4})/', "$1:", $hex['hex']), 0, -1); |
| 64 | 66 | $ipAddress = strtoupper($ipAddress); |
| 65 | 67 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | { |
| 6 | 6 | /** |
| 7 | 7 | * @var string $ipAddress |
| 8 | - **/ |
|
| 8 | + **/ |
|
| 9 | 9 | private $ipAddress=null; |
| 10 | 10 | /** |
| 11 | 11 | * Class constructor. |
@@ -17,9 +17,9 @@ |
||
| 17 | 17 | private $oPDOInstance; |
| 18 | 18 | /** |
| 19 | 19 | * PDO transaction Counter |
| 20 | - * |
|
| 21 | - * @var integer |
|
| 22 | - */ |
|
| 20 | + * |
|
| 21 | + * @var integer |
|
| 22 | + */ |
|
| 23 | 23 | private $transactionCounter = 0; |
| 24 | 24 | /** |
| 25 | 25 | * Class Constructor |
@@ -10,13 +10,13 @@ |
||
| 10 | 10 | * PDO SQLite3 database instance |
| 11 | 11 | * |
| 12 | 12 | * @var GeoipDatabase |
| 13 | - **/ |
|
| 13 | + **/ |
|
| 14 | 14 | private $oDBInstance=null; |
| 15 | 15 | /** |
| 16 | 16 | * Network tools class instance |
| 17 | 17 | * |
| 18 | 18 | * @var GeoipNetwork |
| 19 | - **/ |
|
| 19 | + **/ |
|
| 20 | 20 | private $oNetwork=null; |
| 21 | 21 | /** |
| 22 | 22 | * Class Constructor |