Skip to content
Snippets Groups Projects
Commit e0ae9900 authored by Pau Calabres Garcia-Carpintero's avatar Pau Calabres Garcia-Carpintero Committed by Lucas Hedding
Browse files

Issue #3367680 by paucala, heddn: Using http protocol is insecure. Use https instead

parent 41c1d20b
No related branches found
No related tags found
1 merge request!113367680-http-to-https
......@@ -150,10 +150,10 @@ class SmartIpEventSubscriber extends SmartIpEventSubscriberBase {
or to your defined custom path (Note: It is your responsibility to update
them manually every month and to define such a path, please set
'@auto_update_label' to 'No', and fill in the field which will then appear)", [
'@here' => Link::fromTextAndUrl(t('here'), Url::fromUri('http://lite.ip2location.com/sign-up'))->toString(),
'@here2' => Link::fromTextAndUrl(t('here'), Url::fromUri('http://lite.ip2location.com/login'))->toString(),
'@here' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://lite.ip2location.com/sign-up'))->toString(),
'@here2' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://lite.ip2location.com/login'))->toString(),
'@here3' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://www.ip2location.com/login'))->toString(),
'@here4' => Link::fromTextAndUrl(t('here'), Url::fromUri('http://lite.ip2location.com/database'))->toString(),
'@here4' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://lite.ip2location.com/database'))->toString(),
'@here5' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://www.ip2location.com/download'))->toString(),
'@path' => $privateFolder,
'@auto_update_label' => $autoDbUpdateLabel,
......
......@@ -127,9 +127,9 @@ class SmartIpEventSubscriber extends SmartIpEventSubscriberBase {
and you must be @login to get it. Note: if @ipinfodb respond too slow to
geolocation request, your site's performance will be affected specially if
Smart IP is configured to geolocate anonymous users.", [
'@ipinfodb' => Link::fromTextAndUrl(t('IPInfoDB.com'), Url::fromUri('http://www.ipinfodb.com'))->toString(),
'@ip2location' => Link::fromTextAndUrl(t('IP2Location'), Url::fromUri('http://www.ip2location.com'))->toString(),
'@login' => Link::fromTextAndUrl(t('logged in'), Url::fromUri('http://ipinfodb.com/login.php'))->toString(),
'@ipinfodb' => Link::fromTextAndUrl(t('IPInfoDB.com'), Url::fromUri('https://www.ipinfodb.com'))->toString(),
'@ip2location' => Link::fromTextAndUrl(t('IP2Location'), Url::fromUri('https://www.ip2location.com'))->toString(),
'@login' => Link::fromTextAndUrl(t('logged in'), Url::fromUri('https://ipinfodb.com/login.php'))->toString(),
]);
$form['smart_ip_data_source_selection']['ipinfodb_api_version'] = [
'#type' => 'select',
......@@ -149,7 +149,7 @@ class SmartIpEventSubscriber extends SmartIpEventSubscriberBase {
'#description' => t(
'The use of IPInfoDB.com service requires API key. Registration for the
new API key is free, sign up @here.', [
'@here' => Link::fromTextAndUrl(t('here'), Url::fromUri('http://www.ipinfodb.com/register.php'))->toString(),
'@here' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://www.ipinfodb.com/register.php'))->toString(),
]
),
'#default_value' => $config->get('api_key'),
......
......@@ -12,11 +12,11 @@ class IpinfodbWebService {
/**
* IPInfoDB web service version 2 query URL.
*/
const V2_URL = 'http://api.ipinfodb.com/v2/ip_query.php';
const V2_URL = 'https://api.ipinfodb.com/v2/ip_query.php';
/**
* IPInfoDB web service version 3 query URL.
*/
const V3_URL = 'http://api.ipinfodb.com/v3/ip-city';
const V3_URL = 'https://api.ipinfodb.com/v3/ip-city';
}
......@@ -156,7 +156,7 @@ class SmartIpEventSubscriber extends SmartIpEventSubscriberBase {
field which will then appear).", [
'@maxmind_db_reader_api' => Link::fromTextAndUrl(t('MaxMind DB Reader PHP API'), Url::fromUri('https://github.com/maxmind/MaxMind-DB-Reader-php'))->toString(),
'@install' => Link::fromTextAndUrl(t('install'), Url::fromUri('https://www.webfoobar.com/node/71#install-maxmind-php-c-extension'))->toString(),
'@geoip2_api' => Link::fromTextAndUrl(t('GeoIP2 PHP API'), Url::fromUri('http://maxmind.github.io/GeoIP2-php'))->toString(),
'@geoip2_api' => Link::fromTextAndUrl(t('GeoIP2 PHP API'), Url::fromUri('https://maxmind.github.io/GeoIP2-php'))->toString(),
'@login' => Link::fromTextAndUrl(t('login'), Url::fromUri('https://www.maxmind.com/en/account/login'))->toString(),
'@here' => Link::fromTextAndUrl(t('here'), Url::fromUri('https://www.maxmind.com/en/download_files'))->toString(),
'%file_lite_city' => MaxmindGeoip2BinDb::FILENAME_LITE_CITY . MaxmindGeoip2BinDb::FILE_EXTENSION,
......
......@@ -89,7 +89,7 @@ class SmartIpEventSubscriber extends SmartIpEventSubscriberBase {
will need to @buy one of their services and they will provide you the
login details. You can view your user ID and license key inside your
@account.", [
'@maxmind' => Link::fromTextAndUrl(t('MaxMind GeoIP2 Precision'), Url::fromUri('http://dev.maxmind.com/geoip/geoip2/web-services'))->toString(),
'@maxmind' => Link::fromTextAndUrl(t('MaxMind GeoIP2 Precision'), Url::fromUri('https://dev.maxmind.com/geoip/geoip2/web-services'))->toString(),
'@buy' => Link::fromTextAndUrl(t('buy'), Url::fromUri('https://www.maxmind.com/en/geoip2-precision-services'))->toString(),
'@account' => Link::fromTextAndUrl(t('MaxMind account'), Url::fromUri('https://www.maxmind.com/en/my_license_key'))->toString(),
]);
......
......@@ -160,7 +160,7 @@ class SmartIpAdminSettingsForm extends ConfigFormBase {
'#default_value' => $fallbackDataSource,
'#options' => [
$this->t("MaxMind's Apache module @mod_geoip (@status)", [
'@mod_geoip' => Link::fromTextAndUrl($this->t('mod_geoip'), Url::fromUri('http://dev.maxmind.com/geoip/legacy/mod_geoip2'))->toString(),
'@mod_geoip' => Link::fromTextAndUrl($this->t('mod_geoip'), Url::fromUri('https://dev.maxmind.com/geoip/legacy/mod_geoip2'))->toString(),
'@status' => $modGeoipStat,
]),
$this->t("X-GeoIP-Country: XX header, set by e.g. nginx (@status)", [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment