EduBox Dev
73b561ed33
- edubox-tools.patch : getShopDomain/Ssl conservent les ports non standards - edubox-configuration.patch : PS_SHOP_DOMAIN, _PS_BASE_URL_, PS_SSL_ENABLED… résolus dynamiquement - edubox-shop-getbaseurl.patch : Shop::getBaseURL() utilise le host de la requête - edubox-shopurl.patch : getMainShopDomain conserve les ports non standards - edubox-clear-cache-init.sh : vidage des caches à chaque démarrage - seed.ts : passage au tag 9-edubox-9 - README mis à jour avec les nouveaux patches
21 lines
924 B
Diff
21 lines
924 B
Diff
--- a/src/Adapter/Assets/AssetUrlGeneratorTrait.php
|
|
+++ b/src/Adapter/Assets/AssetUrlGeneratorTrait.php
|
|
@@ -49,12 +49,14 @@ trait AssetUrlGeneratorTrait
|
|
protected function getFQDN()
|
|
{
|
|
if (null === $this->fqdn) {
|
|
- if ($this->configuration->get('PS_SSL_ENABLED') && ToolsLegacy::usingSecureMode()) {
|
|
- $this->fqdn = $this->configuration->get('_PS_BASE_URL_SSL_');
|
|
- } else {
|
|
+ // EduBox: rely on the current request security, not on PS_SSL_ENABLED.
|
|
+ // Behind the reverse proxy every public request is HTTPS.
|
|
+ if (ToolsLegacy::usingSecureMode()) {
|
|
+ $this->fqdn = $this->configuration->get('_PS_BASE_URL_SSL_') ?: $this->configuration->get('_PS_BASE_URL_');
|
|
+ } else {
|
|
$this->fqdn = $this->configuration->get('_PS_BASE_URL_');
|
|
}
|
|
}
|
|
|
|
return $this->fqdn;
|
|
}
|