Skip to content

Commit 49be9e3

Browse files
magefanmagefan
authored
Merge pull request #18 from magefan/10959-make-request-to-server-tag-same-as-web-tag-makes-to-server-tag
10959-make-request-to-server-tag-same-as-web-tag-makes-to-server-tag
2 parents 2513146 + 3ec5784 commit 49be9e3

File tree

8 files changed

+276
-75
lines changed

8 files changed

+276
-75
lines changed

‎Api/IpToCountryRepositoryInterface.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
/**
3+
* Copyright © Magefan (support@magefan.com). All rights reserved.
4+
* Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magefan\GeoIp\Api;
10+
11+
interface IpToCountryRepositoryInterface
12+
{
13+
/**
14+
* @param $ip
15+
* @return mixed
16+
*/
17+
public function getCountryCode($ip);
18+
19+
/**
20+
* @return mixed
21+
*/
22+
public function getVisitorCountryCode();
23+
}

‎Api/IpToRegionRepositoryInterface.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Copyright © Magefan (support@magefan.com). All rights reserved.
4+
* Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magefan\GeoIp\Api;
10+
11+
interface IpToRegionRepositoryInterface
12+
{
13+
/**
14+
* @param string $ip
15+
* @return string
16+
*/
17+
public function getRegionCode(string $ip = ''): string;
18+
}

‎Block/Adminhtml/System/Config/Form/IpInfo.php‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,43 @@
44
* See LICENSE.txt for license details (http://opensource.org/licenses/osl-3.0.php).
55
*/
66

7+
declare(strict_types=1);
8+
79
namespace Magefan\GeoIp\Block\Adminhtml\System\Config\Form;
810

9-
use Magefan\GeoIp\Model\IpToCountryRepository;
11+
use Magefan\GeoIp\Api\IpToCountryRepositoryInterface;
12+
use Magefan\GeoIp\Api\IpToRegionRepositoryInterface;
1013

1114
/**
1215
* Admin configurations IP information block
1316
*/
1417
class IpInfo extends \Magento\Config\Block\System\Config\Form\Field
1518
{
1619
/**
17-
* @var \Magefan\GeoIp\Model\IpToCountryRepository
20+
* @var IpToCountryRepositoryInterface
21+
*/
22+
protected $ipToCountryRepository;
23+
24+
/**
25+
* @var IpToRegionRepositoryInterface
1826
*/
19-
protected $ipRepository;
27+
protected $ipToRegionRepository;
2028

2129
/**
2230
* @param \Magento\Backend\Block\Template\Context $context
31+
* @param IpToCountryRepositoryInterface $ipToCountryRepository
32+
* @param IpToRegionRepositoryInterface $ipToRegionRepository
2333
* @param array $data
2434
*/
2535
public function __construct(
2636
\Magento\Backend\Block\Template\Context $context,
27-
IpToCountryRepository $ipRepository,
37+
IpToCountryRepositoryInterface $ipToCountryRepository,
38+
IpToRegionRepositoryInterface $ipToRegionRepository,
2839
array $data = []
2940
) {
3041
parent::__construct($context, $data);
31-
$this->ipRepository = $ipRepository;
42+
$this->ipToCountryRepository = $ipToCountryRepository;
43+
$this->ipToRegionRepository = $ipToRegionRepository;
3244
}
3345

3446
/**
@@ -38,16 +50,18 @@ public function __construct(
3850
*/
3951
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
4052
{
41-
$country = $this->ipRepository->getVisitorCountryCode();
53+
$country = $this->ipToCountryRepository->getVisitorCountryCode();
4254
if ($country == "ZZ") {
4355
$country = 'Undefined';
4456
}
4557

46-
$ip = $this->ipRepository->getRemoteAddress();
58+
$ip = $this->ipToCountryRepository->getRemoteAddress();
59+
$regionId = $this->ipToRegionRepository->getRegionCode();
4760

4861
$html = '<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">
4962
Your IP Address: ' . $ip . '<br/>
50-
Country: <b>' . $country . '</b>
63+
Country: <b>' . $country . '</b><br/>
64+
Region: <b>' . $regionId . '</b>
5165
</div>';
5266

5367
return $html;

‎Model/GeoIpDatabase/MaxMind.php‎

Lines changed: 78 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ class MaxMind
1919
* Url
2020
*/
2121
const URL = 'https://magefan.com/media/geoip/GeoLite2-Country.mmdb';
22+
23+
const URL_CITY = 'https://magefan.com/media/geoip/GeoLite2-City.mmdb';
24+
2225
const URL_API = 'https://download.maxmind.com/app/geoip_download';
26+
2327
/**
2428
* @var \Magento\Framework\Filesystem\DirectoryList
2529
*/
@@ -111,28 +115,33 @@ public function updateByMagefanServer()
111115
{
112116
$dbPath = $this->_dir->getPath('var') . '/magefan/geoip';
113117
$this->createDir($dbPath);
114-
$url = self::URL;
115-
116-
$ch = curl_init();
117-
curl_setopt($ch, CURLOPT_URL, $url);
118-
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
119-
//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
120-
$result = curl_exec($ch);
121-
if (!$result) {
122-
throw new \Magento\Framework\Exception\LocalizedException(__('Can not download GeoLite2-Country.mmdb file.'));
123-
}
124-
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
125-
if ($http_code != 200) {
126-
throw new \Magento\Framework\Exception\LocalizedException(__('File download failed. Http code: %1.', $http_code) );
127-
}
128-
curl_close($ch);
129118

130-
$output_filename = $dbPath . '/' . 'GeoLite2-Country.mmdb';
131-
$fp = fopen($output_filename, 'w');
132-
if (!fwrite($fp, $result)) {
133-
throw new \Magento\Framework\Exception\LocalizedException(__('Can not save or overwrite GeoLite2-Country.mmdb file.'));
119+
foreach ([self::URL, self::URL_CITY] as $url) {
120+
$ch = curl_init();
121+
curl_setopt($ch, CURLOPT_URL, $url);
122+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
123+
124+
$result = curl_exec($ch);
125+
if (!$result) {
126+
throw new \Magento\Framework\Exception\LocalizedException(__('Can not download GeoLite2-Country.mmdb file.'));
127+
}
128+
129+
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
130+
if ($http_code != 200) {
131+
throw new \Magento\Framework\Exception\LocalizedException(__('File download failed. Http code: %1.', $http_code) );
132+
}
133+
134+
curl_close($ch);
135+
136+
$urlArray = explode('/', $url);
137+
$output_filename = $dbPath . '/' . end($urlArray);
138+
139+
$fp = fopen($output_filename, 'w');
140+
if (!fwrite($fp, $result)) {
141+
throw new \Magento\Framework\Exception\LocalizedException(__('Can not save or overwrite GeoLite2-Country.mmdb file.'));
142+
}
143+
fclose($fp);
134144
}
135-
fclose($fp);
136145

137146
return true;
138147
}
@@ -148,60 +157,63 @@ private function updateByAPI()
148157
{
149158
$dbPath = $this->_dir->getPath('var') . '/magefan/geoip';
150159
$this->createDir($dbPath);
151-
$url = self::URL_API . '?' . http_build_query([
152-
'edition_id' => 'GeoLite2-Country',
153-
'suffix' => 'tar.gz',
154-
'license_key' => $this->config->getLicenseKey()
155-
]);
156-
157-
$ch = curl_init($url);
158-
159-
$outputFilename = $dbPath . DIRECTORY_SEPARATOR . 'GeoLite2-Country.tar.gz';
160-
$fp = fopen($outputFilename, 'wb');
161-
162-
curl_setopt_array($ch, array(
163-
CURLOPT_HTTPGET => true,
164-
CURLOPT_BINARYTRANSFER => true,
165-
CURLOPT_HEADER => false,
166-
CURLOPT_FILE => $fp,
167-
));
168-
169-
$response = curl_exec($ch);
170-
171-
if (!$response) {
172-
throw new \Magento\Framework\Exception\LocalizedException(
173-
__('Can not download GeoLite2-Country.tar.gz archive.')
174-
);
175-
}
176160

177-
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
178-
if ($http_code != 200) {
179-
throw new \Magento\Framework\Exception\LocalizedException(
180-
__('File download failed. Http code: %1. Please check the license key.', $http_code)
181-
);
182-
}
161+
foreach (['GeoLite2-Country', 'GeoLite2-City'] as $file) {
162+
$url = self::URL_API . '?' . http_build_query([
163+
'edition_id' => $file,
164+
'suffix' => 'tar.gz',
165+
'license_key' => $this->config->getLicenseKey()
166+
]);
167+
168+
$ch = curl_init($url);
169+
170+
$outputFilename = $dbPath . DIRECTORY_SEPARATOR . $file . '.tar.gz';
171+
$fp = fopen($outputFilename, 'wb');
172+
173+
curl_setopt_array($ch, array(
174+
CURLOPT_HTTPGET => true,
175+
CURLOPT_BINARYTRANSFER => true,
176+
CURLOPT_HEADER => false,
177+
CURLOPT_FILE => $fp,
178+
));
179+
180+
$response = curl_exec($ch);
183181

184-
curl_close($ch);
182+
if (!$response) {
183+
throw new \Magento\Framework\Exception\LocalizedException(
184+
__('Can not download ' . $file . '.tar.gz archive.')
185+
);
186+
}
187+
188+
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
189+
if ($http_code != 200) {
190+
throw new \Magento\Framework\Exception\LocalizedException(
191+
__('File download failed. Http code: %1. Please check the license key.', $http_code)
192+
);
193+
}
185194

186-
$unpackGz = $this->gz->unpack($outputFilename, $dbPath . DIRECTORY_SEPARATOR);
187-
$unpackTar = $this->tar->unpack($unpackGz, $dbPath . DIRECTORY_SEPARATOR);
188-
$dir = $this->_file->getDirectoriesList($unpackTar);
189-
$this->_file->mv($dir[0] . '/GeoLite2-Country.mmdb', $unpackTar . 'GeoLite2-Country.mmdb');
195+
curl_close($ch);
190196

191-
$this->_file->open(['path' => $unpackTar]);
192-
$list = $this->_file->ls();
193-
$this->_file->close();
197+
$unpackGz = $this->gz->unpack($outputFilename, $dbPath . DIRECTORY_SEPARATOR);
198+
$unpackTar = $this->tar->unpack($unpackGz, $dbPath . DIRECTORY_SEPARATOR);
199+
$dir = $this->_file->getDirectoriesList($unpackTar);
200+
$this->_file->mv($dir[0] . '/' . $file . '.mmdb', $unpackTar . $file . '.mmdb');
194201

195-
foreach ($list as $info) {
196-
if ($info['text'] !== 'GeoLite2-Country.mmdb') {
197-
if (isset($info['id'])) {
198-
$this->_file->rmdirRecursive($info['id']);
202+
$this->_file->open(['path' => $unpackTar]);
203+
$list = $this->_file->ls();
204+
$this->_file->close();
205+
206+
foreach ($list as $info) {
207+
if (!in_array($info['text'], ['GeoLite2-Country.mmdb', 'GeoLite2-City.mmdb'])) {
208+
if (isset($info['id'])) {
209+
$this->_file->rmdirRecursive($info['id']);
210+
}
211+
$this->_file->rm($info['text']);
199212
}
200-
$this->_file->rm($info['text']);
201213
}
202-
}
203214

204-
fclose($fp);
215+
fclose($fp);
216+
}
205217

206218
return true;
207219
}

‎Model/IpToCountryRepository.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
use Magento\Framework\App\RequestInterface;
1414
use Magento\Framework\App\Config\ScopeConfigInterface;
1515
use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
16+
use Magefan\GeoIp\Api\IpToCountryRepositoryInterface;
1617

1718
/**
1819
* Class IpToCountryRepository
1920
* @package Magefan\GeoIp\Model
2021
*/
21-
class IpToCountryRepository
22+
class IpToCountryRepository implements IpToCountryRepositoryInterface
2223
{
2324
/**
2425
* Default path in system.xml

0 commit comments

Comments
 (0)