Merge branch 'release/3.2.12' into v3

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Retour Changelog
 
+## 3.2.12 - 2023.10.26
+### Fixed
+* Fixes issue where only first line of uploaded CSV is saved in cache in load balanced environment ([#286](https://github.com/nystudio107/craft-retour/pull/286))
+* Strip off a leading `/` before making a site URL from a path, because otherwise `Craft.getUrl()` considers it an absolute URL and returns it ([#281](https://github.com/nystudio107/craft-retour/issues/281))
+
 ## 3.2.11 - 2023.08.15
 ### Added
 * Add db index for `redirectMatchType` to help with query performance ([#282](https://github.com/nystudio107/craft-retour/issues/282))

buildchain/src/vue/FileNotFoundUrl.vue

@@ -28,6 +28,8 @@ export default {
       }
       let absoluteUrl = new RegExp('^(?:[a-z]+:)?//', 'i');
       if (!absoluteUrl.test(url) && !url.includes('$')) {
+        // Strip off a leading `/` because otherwise `Craft.getUrl()` considers it an absolute URL and returns it
+        url = url.replace(/^\//, '');
         url = Craft.getSiteUrl(url);
       }
 

buildchain/src/vue/RedirectsTable.vue

@@ -256,7 +256,9 @@ export default {
       let url = value;
       let absoluteUrl = new RegExp('^(?:[a-z]+:)?//', 'i');
       if (!absoluteUrl.test(url) && !url.includes('$')) {
-        url = Craft.getSiteUrl(value);
+        // Strip off a leading `/` because otherwise `Craft.getUrl()` considers it an absolute URL and returns it
+        url = url.replace(/^\//, '');
+        url = Craft.getSiteUrl(url);
       }
       return `
                 <a class="go" href="${url}" title="${url}" target="_blank" rel="noopener">${value}</a>

buildchain/src/vue/ShortlinksTable.vue

@@ -256,7 +256,9 @@ export default {
       let url = value;
       let absoluteUrl = new RegExp('^(?:[a-z]+:)?//', 'i');
       if (!absoluteUrl.test(url) && !url.includes('$')) {
-        url = Craft.getSiteUrl(value);
+        // Strip off a leading `/` because otherwise `Craft.getUrl()` considers it an absolute URL and returns it
+        url = url.replace(/^\//, '');
+        url = Craft.getSiteUrl(url);
       }
       return `
                 <a class="go" href="${url}" title="${url}" target="_blank" rel="noopener">${value}</a>

composer.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": "3.2.11",
+  "version": "3.2.12",
   "keywords": [
     "craftcms",
     "craft-plugin",

src/controllers/FileController.php

@@ -218,14 +218,9 @@ public function actionImportCsv(string $siteHandle = null): Response
             $filePath = Craft::$app->getPath()->getTempPath() . DIRECTORY_SEPARATOR . $filename;
             $file->saveAs($filePath, false);
             // Also save the file to the cache as a backup way to access it
-            $cache = Craft::$app->getCache();
-            $fileHandle = fopen($filePath, 'r');
-            if ($fileHandle) {
-                $fileContents = fgets($fileHandle);
-                if ($fileContents) {
-                    $cache->set($filePath, $fileContents);
-                }
-                fclose($fileHandle);
+            $fileContents = @file_get_contents($filePath);
+            if ($fileContents) {
+                Craft::$app->getCache()->set($filePath, $fileContents);
             }
             // Read in the headers
             $csv = Reader::createFromPath($file->tempName);