Merge branch 'release/5.0.12' into v5

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Retour Changelog
 
+## 5.0.12 - 2025.08.17
+### Changed
+* Use `StringHelper::convertToUtf8()` instead of our homebrew solution
+* Throw an exception if an attempt is made to edit a redirect that doesn't exist ([#345](https://github.com/nystudio107/craft-retour/issues/345))
+
+### Fixed
+* Fixed a regression that caused the redirect loop detection to no longer function ([#348](https://github.com/nystudio107/craft-retour/issues/348))
+
 ## 5.0.11 - 2025.06.13
 ### Changed
 * Allow `RedirectEvent`s to change the redirect that is saved ([#342](https://github.com/nystudio107/craft-retour/issues/342))

buildchain/package-lock.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-retour",
   "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
   "type": "craft-plugin",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "keywords": [
     "craftcms",
     "craft-plugin",

composer.json

@@ -23,6 +23,7 @@
 use nystudio107\retour\helpers\Permission as PermissionHelper;
 use nystudio107\retour\models\StaticRedirects as StaticRedirectsModel;
 use nystudio107\retour\Retour;
+use Throwable;
 use yii\base\Exception;
 use yii\base\InvalidConfigException;
 use yii\web\BadRequestHttpException;
@@ -138,15 +139,7 @@ public function actionEditRedirect(
         if ($redirect === null) {
             $redirectConfig = Retour::$plugin->redirects->getRedirectById($redirectId);
             if ($redirectConfig === null) {
-                $redirectConfig = [];
-                Craft::error(
-                    Craft::t(
-                        'retour',
-                        "Couldn't load redirect id {id}",
-                        ['id' => $redirectId]
-                    ),
-                    __METHOD__
-                );
+                throw new NotFoundHttpException('Redirect not found');
             }
             $redirect = new StaticRedirectsModel($redirectConfig);
         }
@@ -284,7 +277,7 @@ public function actionSaveRedirect(): ?Response
         }
         // Save the redirect
         $redirectConfig = $redirect->getAttributes();
-        Retour::$plugin->redirects->saveRedirect($redirectConfig);
+        Retour::$plugin->redirects->saveRedirect($redirectConfig, false);
         // Handle the case where the redirect wasn't saved because it'd create a redirect loop
         $testRedirectConfig = Retour::$plugin->redirects->getRedirectByRedirectSrcUrl(
             $redirectConfig['redirectSrcUrl'],
@@ -314,8 +307,8 @@ public function actionSaveRedirect(): ?Response
      * @param string|null $siteHandle
      *
      * @return Response
-     * @throws \yii\web\ForbiddenHttpException
-     * @throws \yii\web\NotFoundHttpException
+     * @throws ForbiddenHttpException
+     * @throws NotFoundHttpException
      */
     public function actionShortlinks(string $siteHandle = null): Response
     {
@@ -368,7 +361,7 @@ public function actionShortlinks(string $siteHandle = null): Response
      * @throws BadRequestHttpException
      * @throws ForbiddenHttpException
      * @throws MissingComponentException
-     * @throws \Throwable
+     * @throws Throwable
      * @throws ElementNotFoundException
      * @throws Exception
      */

docs/package-lock.json

@@ -11,8 +11,8 @@
 
 namespace nystudio107\retour\helpers;
 
+use craft\helpers\StringHelper;
 use Stringy\Stringy;
-use function function_exists;
 
 /**
  * @author    nystudio107
@@ -88,12 +88,7 @@ public static function cleanupText(string $text): string
             return '';
         }
         // Convert to UTF-8
-        if (function_exists('iconv')) {
-            $text = iconv(mb_detect_encoding($text, mb_detect_order(), true), 'UTF-8//IGNORE', $text);
-        } else {
-            ini_set('mbstring.substitute_character', 'none');
-            $text = mb_convert_encoding($text, 'UTF-8', 'UTF-8');
-        }
+        $text = StringHelper::convertToUtf8($text);
         // Strip HTML tags
         $text = strip_tags($text);
         // Remove excess whitespace

src/controllers/RedirectsController.php

@@ -1115,9 +1115,10 @@ public function deleteShortlinkById(int $redirectId): bool
 
     /**
      * @param array $redirectConfig
+     * @param bool $checkForRedirectLoop
      * @return bool
      */
-    public function saveRedirect(array $redirectConfig): bool
+    public function saveRedirect(array $redirectConfig, bool $checkForRedirectLoop = true): bool
     {
         // Handle URL encoded URLs by decoding them before saving them
         if (isset($redirectConfig['redirectMatchType']) && $redirectConfig['redirectMatchType'] === 'exactmatch') {
@@ -1230,6 +1231,32 @@ public function saveRedirect(array $redirectConfig): bool
                 return false;
             }
         }
+        if ($checkForRedirectLoop) {
+            // To prevent redirect loops, see if any static redirects have our redirectDestUrl as their redirectSrcUrl
+            $testRedirectConfig = $this->getRedirectByRedirectSrcUrl(
+                $redirectConfig['redirectDestUrl'],
+                $redirectConfig['siteId']
+            );
+            if ($testRedirectConfig !== null) {
+                Craft::debug(
+                    Craft::t(
+                        'retour',
+                        'Deleting redirect to prevent a loop: {redirect}',
+                        ['redirect' => print_r($testRedirectConfig, true)]
+                    ),
+                    __METHOD__
+                );
+                // Delete the redirect that has a redirectSrcUrl the same as this record's redirectDestUrl
+                try {
+                    $db->createCommand()->delete(
+                        '{{%retour_static_redirects}}',
+                        ['id' => $testRedirectConfig['id']]
+                    )->execute();
+                } catch (Exception $e) {
+                    Craft::error($e->getMessage(), __METHOD__);
+                }
+            }
+        }
         // Trigger a 'afterSaveRedirect' event
         $this->trigger(self::EVENT_AFTER_SAVE_REDIRECT, $event);