hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller

Browse Source
This commit is contained in:
Xavier Rousset
2019-08-14 15:45:04 +02:00
parent 6b01a5df23
commit 80b4c9a6a6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Application.php
View File

@@ -653,7 +653,7 @@ class Application extends SilexApplication
private function setupGeonames() private function setupGeonames()
{ {
$this['geonames.server-uri'] = $this->share(function (Application $app) { $this['geonames.server-uri'] = $this->share(function (Application $app) {
return $app['conf']->get(['registry', 'webservices', 'geonames-server'], 'http://geonames.alchemyasp.com/'); return $app['conf']->get(['registry', 'webservices', 'geonames-server'], 'https://geonames.alchemyasp.com/');
}); });
} }

2
lib/Alchemy/Phrasea/Controller/Root/LoginController.php
View File

@@ -265,7 +265,7 @@ class LoginController extends Controller
return $this->render('login/register-classic.html.twig', array_merge( return $this->render('login/register-classic.html.twig', array_merge(
$this->getDefaultTemplateVariables($request), $this->getDefaultTemplateVariables($request),
[ [
'geonames_server_uri' => str_replace(sprintf('%s:', parse_url($url, PHP_URL_SCHEME)), '', $url), 'geonames_server_uri' => $url,
'form' => $form->createView() 'form' => $form->createView()
])); ]));
} }

2
lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View File

@@ -146,7 +146,7 @@ class RegistryFormManipulator
], ],
'webservices' => [ 'webservices' => [
'google-charts-enabled' => true, 'google-charts-enabled' => true,
'geonames-server' => 'http://geonames.alchemyasp.com/', 'geonames-server' => 'https://geonames.alchemyasp.com/',
'captchas-enabled' => false, 'captchas-enabled' => false,
'recaptcha-public-key' => '', 'recaptcha-public-key' => '',
'recaptcha-private-key' => '', 'recaptcha-private-key' => '',