fix for missing slash issue on path forwarding

Classes/Domain/Model/Redirect.php

@@ -55,6 +55,13 @@ class Redirect
      */
     protected $forwardUrl;
 
+    /**
+     * Additional params for the URL
+     *
+     * @var string
+     */
+    protected $additionalParams;
+
     /**
      * The scheme
      *
@@ -110,6 +117,7 @@ class Redirect
      * @param int $languageUid The language uid
      * @param int $type The type of redirect
      * @param string $forwardUrl The URL to be forwarded
+     * @param string $additionalParams Additional params for the URL
      * @param int $internalPage Uid of the internal page
      * @param string $externalUrl External URL
      * @param string $internalFile Path to the internal file
@@ -120,6 +128,7 @@ public function __construct(
         $languageUid,
         $type,
         $forwardUrl,
+        $additionalParams,
         $internalPage,
         $externalUrl,
         $internalFile,
@@ -129,6 +138,7 @@ public function __construct(
         $this->languageUid = (int) $languageUid;
         $this->type = (int) $type;
         $this->forwardUrl = (string) $forwardUrl;
+        $this->additionalParams = (string) $additionalParams;
         $this->internalPage = (int) $internalPage;
         $this->externalUrl = (string) $externalUrl;
         $this->internalFile = (string) $internalFile;
@@ -198,7 +208,7 @@ protected function constructUrlForInternalPage()
             [
                 'parameter' => $this->internalPage,
                 'forceAbsoluteUrl' => true,
-                'additionalParams' => '&L=' . $this->languageUid
+                'additionalParams' => '&L=' . $this->languageUid . $this->additionalParams
             ]
         );
     }
@@ -232,7 +242,7 @@ protected function constructUrlForExternal()
      */
     protected function constructUrlForPath($scheme, $host, $oldPath)
     {
-        $needle = '/'.preg_quote($this->path, '/').'/';
+        $needle = '/'.preg_quote(trim($this->path, '/'), '/').'/';
 
         $newPath = preg_replace($needle, trim($this->forwardUrl, '/'), $oldPath, 1);
 

Classes/Domain/Repository/RedirectRepository.php

@@ -56,6 +56,7 @@ public function findByPathAndDomain($host, $path)
                 tx_urlforwarding_domain_model_redirect.sys_language_uid,
                 tx_urlforwarding_domain_model_redirect.type,
                 tx_urlforwarding_domain_model_redirect.forward_url,
+                tx_urlforwarding_domain_model_redirect.additional_params,
                 tx_urlforwarding_domain_model_redirect.internal_page,
                 tx_urlforwarding_domain_model_redirect.external_url,
                 tx_urlforwarding_domain_model_redirect.internal_file,
@@ -110,6 +111,7 @@ public function findByPathAndDomain($host, $path)
                 $result['sys_language_uid'],
                 $result['type'],
                 $result['forward_url'],
+                $result['additional_params'],
                 $result['internal_page'],
                 $result['external_url'],
                 $result['internal_file'],

Configuration/TCA/tx_urlforwarding_domain_model_redirect.php

@@ -38,6 +38,7 @@
             hidden,
             type,
             forward_url,
+            additional_params,
             internal_page,
             external_url,
             internal_file,
@@ -57,6 +58,7 @@
                 --palette--;;general,
                 forward_url,
                 internal_page,
+                additional_params,
                 http_status,
                 domain,
             --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
@@ -305,6 +307,15 @@
                 ]
             ]
         ],
+        'additional_params' => [
+            'exclude' => false,
+            'label' => 'LLL:EXT:url_forwarding/Resources/Private/Language/TCA/Redirect.xlf:additional_params',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'eval' => 'trim',
+            ]
+        ],
         'external_url' => [
             'exclude' => false,
             'label' => 'LLL:EXT:url_forwarding/Resources/Private/Language/TCA/Redirect.xlf:external_url',

Resources/Private/Language/TCA/Redirect.xlf

@@ -45,6 +45,9 @@
 			<trans-unit id="forward_url">
 				<source>Source</source>
 			</trans-unit>
+			<trans-unit id="additional_params">
+      	<source>Additional Params</source>
+      </trans-unit>
 			<trans-unit id="forward_url.3">
 				<source>New path</source>
 			</trans-unit>

Resources/Private/Language/TCA/Redirect_csh.xlf

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xliff version="1.0">
+	<file source-language="en" datatype="plaintext" original="messages" date="2016-11-30T17:35:37Z" product-name="url_forwarding">
+		<header/>
+		<body>
+      <trans-unit id="additional_params.description">
+      	<source><![CDATA[For example: &utm_source=old-domain.com&utm_medium=301]]></source>
+      </trans-unit>
+		</body>
+	</file>
+</xliff>

ext_tables.php

@@ -0,0 +1,7 @@
+<?php
+defined('TYPO3_MODE') or die();
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
+'tx_urlforwarding_domain_model_redirect',
+'EXT:url_forwarding/Resources/Private/Language/TCA/Redirect_csh.xlf'
+);

ext_tables.sql

@@ -8,6 +8,7 @@ CREATE TABLE tx_urlforwarding_domain_model_redirect (
 	type varchar(100) NOT NULL DEFAULT '0',
 
 	forward_url text NOT NULL,
+	additional_params text NOT NULL,
 	path text NOT NULL,
 	internal_page varchar(255) DEFAULT '' NOT NULL,
 	external_url text NOT NULL,