Skip to content

Feature/depriciating context usage #132

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/depriciating context usage #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8168a68
Updating a onPageNotFound() to extend search for the old alias pages.…
svrhovac Dec 11, 2024
b6b1214
Merge branch 'master' into feature/depriciating-context-usage
svrhovac Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions core/components/seosuite/src/Plugins/Redirects.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ class Redirects extends Base
*/
public function onPageNotFound()
{
//$request = urldecode(trim($_REQUEST[$this->modx->getOption('request_param_alias', null, 'q')], '/'));
$request = $this->getFullUrl();
if (!empty($request)) {
$this->redirect($request);
$fullUrl = $this->getFullUrl();
$alias = $this->getPageAlias();
if (!empty($fullUrl)) {
$this->redirect($fullUrl, $alias);
}
}

Expand All @@ -25,28 +25,22 @@ public function onPageNotFound()
* @access protected.
* @param String $request.
*/
protected function redirect($request)
protected function redirect(string $request, $alias = '')
{
$criteria = $this->modx->newQuery(SeoSuiteRedirect::class, [
'active' => 1,
[
'old_url' => $request,
// 'OR:old_url:=' => preg_replace('#^\w{2}/#', '', $request),
// 'OR:old_url:=' => $this->getFullUrl()
'old_url' => $request,
'OR:old_url:=' => $alias,
],
/*
[
'context_key' => '',
'OR:context_key:=' => $this->modx->context->get('key')
],
*/
]);

$criteria->sortby('context_key', 'DESC');

foreach ($this->modx->getIterator(SeoSuiteRedirect::class, $criteria) as $redirect) {
$redirect->set('visits', (int) $redirect->get('visits') + 1);
$redirect->set('last_visit', date('Y-m-d H:i:s'));
$redirect->set('old_url', $request);

if ($redirect->save()) {
if (is_numeric($redirect->get('new_url'))) {
Expand All @@ -55,8 +49,8 @@ protected function redirect($request)
$url = $redirect->get('new_url');
}

if (strpos($url, 'www') === 0) {
$url = 'http://' . $url;
if (str_starts_with($url, 'www')) {
$url = 'https://' . $url;
}

if (!empty($url)) {
Expand Down Expand Up @@ -119,12 +113,18 @@ protected function shouldLog404($request)
return true;
}

protected function getFullUrl()
protected function getFullUrl(): string
{
$protocol = (empty($_SERVER['HTTPS']) ? 'http' : 'https') . '://';
$host = $_SERVER['HTTP_HOST'];
$request = $_SERVER['REQUEST_URI'];
$resource = $_SERVER['REQUEST_URI'];

return $protocol . $host . $request;
return $protocol . $host . $resource;
}

private function getPageAlias(): string
{
$aliasParam = $this->modx->getOption('request_param_alias', null, 'q');
return urldecode(trim($_REQUEST[$aliasParam], '/'));
}
}