Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Solve SEF canonical issues #9565

Merged
merged 9 commits into from Mar 26, 2016
Merged

Solve SEF canonical issues #9565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
958f7c6
solve sef canocical issues
andrepereiradasilva Mar 24, 2016
20c9d0e
Update sef.php
andrepereiradasilva Mar 24, 2016
9312a21
minor change
andrepereiradasilva Mar 24, 2016
d00b99c
better sef canonical
andrepereiradasilva Mar 24, 2016
8daa095
add only canonical if the sef plugin domain field is entered
andrepereiradasilva Mar 25, 2016
4453a23
add hint to field
andrepereiradasilva Mar 25, 2016
1c34b7b
just better comments
andrepereiradasilva Mar 25, 2016
86f63a6
use juri instead of router to avoid wrong canonicals
andrepereiradasilva Mar 25, 2016
99b82a7
make george happy
andrepereiradasilva Mar 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 29 additions & 7 deletions plugins/system/sef/sef.php
View file
Open in desktop
Expand Up @@ -40,20 +40,42 @@ public function onAfterDispatch()
return;
}

$uri = JUri::getInstance();
$domain = $this->params->get('domain');
$sefDomain = $this->params->get('domain', '');

if ($domain === false || $domain === '')
// Don't add a canonical html tag if no alternative domain has added in SEF plugin domain field.
if (empty($sefDomain))
{
$domain = $uri->toString(array('scheme', 'host', 'port'));
return;
}

$link = $domain . JRoute::_('index.php?' . http_build_query($this->app->getRouter()->getVars()), false);
// Check if a canonical html tag already exists (for instance, added by a component).
$canonical = '';
foreach ($doc->_links as $linkUrl => $link)
{
if (isset($link['relation']) && $link['relation'] === 'canonical')
{
$canonical = $linkUrl;
break;
}
}

if (rawurldecode($uri->toString()) !== $link)
// If a canonical html tag already exists get the canonical and change it to use the SEF plugin domain field.
if (!empty($canonical))
{
$doc->addHeadLink(htmlspecialchars($link), 'canonical');
// Remove current canonical link.
unset($doc->_links[$canonical]);

// Set the current canonical link but use the SEF system plugin domain field.
$canonical = $sefDomain . JUri::getInstance($canonical)->toString(array('path', 'query', 'fragment'));
}
// If a canonical html doesn't exists already add a canonical html tag using the SEF plugin domain field.
else
{
$canonical = $sefDomain . JUri::getInstance()->toString(array('path', 'query', 'fragment'));
}

// Add the canonical link.
$doc->addHeadLink(htmlspecialchars($canonical), 'canonical');
}

/**
Expand Down
1 change: 1 addition & 0 deletions plugins/system/sef/sef.xml
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
<field name="domain" type="url"
description="PLG_SEF_DOMAIN_DESCRIPTION"
label="PLG_SEF_DOMAIN_LABEL"
hint="https://www.example.com"
filter="url"
validate="url"
/>
Expand Down