50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
--- a/controllers/admin/AdminDashboardController.php
|
|
+++ b/controllers/admin/AdminDashboardController.php
|
|
@@ -330,43 +330,9 @@
|
|
|
|
protected function getWarningDomainName()
|
|
{
|
|
- $warning = false;
|
|
- if (Shop::isFeatureActive()) {
|
|
- return;
|
|
- }
|
|
-
|
|
- $shop = Context::getContext()->shop;
|
|
- if ($_SERVER['HTTP_HOST'] != $shop->domain && $_SERVER['HTTP_HOST'] != $shop->domain_ssl && Tools::getValue('ajax') == false) {
|
|
- $warning = $this->trans('You are currently connected under the following domain name:', [], 'Admin.Dashboard.Notification') . ' <span style="color: #CC0000;">' . $_SERVER['HTTP_HOST'] . '</span><br />';
|
|
- if (Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')) {
|
|
- $warning .= $this->trans(
|
|
- 'This is different from the shop domain name set in the Multistore settings: "%s".',
|
|
- [
|
|
- '%s' => $shop->domain,
|
|
- ],
|
|
- 'Admin.Dashboard.Notification'
|
|
- ) . $this->trans(
|
|
- 'If this is your main domain, please {link}change it now{/link}.',
|
|
- [
|
|
- '{link}' => '<a href="' . $this->context->link->getAdminLink('AdminShopUrl', true, [], ['id_shop_url' => (int) $shop->id, 'updateshop_url' => 1]) . '">',
|
|
- '{/link}' => '</a>',
|
|
- ],
|
|
- 'Admin.Dashboard.Notification'
|
|
- );
|
|
- } else {
|
|
- $warning .= $this->trans('This is different from the domain name set in the "SEO & URLs" tab.', [], 'Admin.Dashboard.Notification') . '
|
|
- ' . $this->trans(
|
|
- 'If this is your main domain, please {link}change it now{/link}.',
|
|
- [
|
|
- '{link}' => '<a href="' . $this->context->link->getAdminLink('AdminMeta') . '#meta_fieldset_shop_url">',
|
|
- '{/link}' => '</a>',
|
|
- ],
|
|
- 'Admin.Dashboard.Notification'
|
|
- );
|
|
- }
|
|
- }
|
|
-
|
|
- return $warning;
|
|
+ // EduBox: instances use dynamic public domains behind a reverse proxy.
|
|
+ // The domain stored during installation never matches the request host.
|
|
+ return false;
|
|
}
|
|
|
|
public function ajaxProcessRefreshDashboard()
|