Merge pull request #465 from matomo-org/m10336-ui-links-add-campaign

Add campaign tracking parameters for all links within Matomo app that link to matomo.org

Google/GoogleGA4GoalMapper.php

@@ -13,7 +13,6 @@
 use Piwik\Log\LoggerInterface;
 class GoogleGA4GoalMapper
 {
-    const FUNNELS_URL = 'https://plugins.matomo.org/Funnels';
     /**
      * @var LoggerInterface
      */

Google/GoogleGoalMapper.php

@@ -11,9 +11,9 @@
 use Piwik\Plugins\GoogleAnalyticsImporter\CannotImportGoalException;
 use Piwik\Plugins\SitesManager\API;
 use Piwik\Log\LoggerInterface;
+use Piwik\Url;
 class GoogleGoalMapper
 {
-    const FUNNELS_URL = 'https://plugins.matomo.org/Funnels';
     /**
      * @var LoggerInterface
      */
@@ -90,7 +90,8 @@ private function mapUrlDestinationGoal(array &$result, \Matomo\Dependencies\Goog
             return;
         }
         if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Funnels')) {
-            throw new CannotImportGoalException($gaGoal, 'multiple steps in a URL destination goal found, this is only supported in Matomo through the <a href="' . self::FUNNELS_URL . '">Funnels</a> plugin');
+            throw new CannotImportGoalException($gaGoal, 'multiple steps in a URL destination goal found, this is only supported in Matomo through the <a href="' .
+                Url::addCampaignParametersToMatomoLink('https://plugins.matomo.org/Funnels') . '">Funnels</a> plugin');
         }
         $result['funnel'] = $this->mapFunnelSteps($gaGoal, $urlMatchDetails);
     }

GoogleAnalyticsImporter.php

@@ -452,6 +452,6 @@ public static function getConfigureConnectProps($nonce)
         if ($idSite < 1) {
             $idSite = StaticContainer::get(UserPreferences::class)->getDefaultWebsiteId();
         }
-        return ['isConnectAccountsActivated' => $isConnectAccountsActivated, 'primaryText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel1'), 'radioOptions' => !$isConnectAccountsActivated ? [] : ['connectAccounts' => Piwik::translate('ConnectAccounts_OptionQuickConnectWithGa'), 'manual' => Piwik::translate('ConnectAccounts_OptionAdvancedConnectWithGa')], 'googleAuthUrl' => $googleAuthUrl, 'manualConfigText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel2') . '<br />' . Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel3', ['<a href="https://matomo.org/faq/general/set-up-google-analytics-import/" rel="noreferrer noopener" target="_blank">', '</a>']), 'manualConfigNonce' => $nonce, 'manualActionUrl' => Url::getCurrentUrlWithoutQueryString() . '?' . Http::buildQuery(['module' => 'GoogleAnalyticsImporter', 'action' => 'configureClient', 'idSite' => $idSite]), 'connectAccountsUrl' => $googleAuthUrl, 'connectAccountsBtnText' => Piwik::translate('ConnectAccounts_ConnectWithGoogleText'), 'additionalHelpText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterHelpNewDate', ['<strong>', '</strong>'])];
+        return ['isConnectAccountsActivated' => $isConnectAccountsActivated, 'primaryText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel1'), 'radioOptions' => !$isConnectAccountsActivated ? [] : ['connectAccounts' => Piwik::translate('ConnectAccounts_OptionQuickConnectWithGa'), 'manual' => Piwik::translate('ConnectAccounts_OptionAdvancedConnectWithGa')], 'googleAuthUrl' => $googleAuthUrl, 'manualConfigText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel2') . '<br />' . Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterLabel3', ['<a href="'.Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/general/set-up-google-analytics-import/').'" rel="noreferrer noopener" target="_blank">', '</a>']), 'manualConfigNonce' => $nonce, 'manualActionUrl' => Url::getCurrentUrlWithoutQueryString() . '?' . Http::buildQuery(['module' => 'GoogleAnalyticsImporter', 'action' => 'configureClient', 'idSite' => $idSite]), 'connectAccountsUrl' => $googleAuthUrl, 'connectAccountsBtnText' => Piwik::translate('ConnectAccounts_ConnectWithGoogleText'), 'additionalHelpText' => Piwik::translate('GoogleAnalyticsImporter_ConfigureTheImporterHelpNewDate', ['<strong>', '</strong>'])];
     }
 }

vue/src/Configure/ConfigureConnection.vue

@@ -90,6 +90,7 @@
 import { defineComponent } from 'vue';
 import {
   translate,
+  externalLink,
 } from 'CoreHome';
 
 export default defineComponent({
@@ -146,21 +147,19 @@ export default defineComponent({
   },
   computed: {
     setupGoogleAnalyticsImportFaq() {
-      const url = 'https://matomo.org/faq/general/set-up-google-analytics-import/';
       return translate(
         'GoogleAnalyticsImporter_ConfigureTheImporterLabel3',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/faq/general/set-up-google-analytics-import/'),
         '</a>',
       );
     },
     isUploadButtonDisabled() {
       return this.isSelectingFile || this.isUploading;
     },
     getAdvanceConnectStep01Text() {
-      const faqLink = 'https://matomo.org/faq/general/set-up-google-analytics-import/';
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep01',
-        `<a href="${faqLink}" target="_blank" rel="noreferrer noopener">`,
+        externalLink('https://matomo.org/faq/general/set-up-google-analytics-import/'),
         '</a>',
       );
     },
@@ -171,19 +170,18 @@ export default defineComponent({
       );
     },
     getAdvanceConnectStep04Text() {
-      const faqLink = 'https://matomo.org/faq/general/running-the-google-analytics-import/';
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep04',
         `<a href="${this.indexActionUrl}" target="_blank" rel="noreferrer noopener">`,
         '</a>',
-        `<a href="${faqLink}" target="_blank" rel="noreferrer noopener">`,
+        externalLink('https://matomo.org/faq/general/running-the-google-analytics-import/'),
         '</a>',
       );
     },
     getAdvanceConnectStep05Text() {
       return this.translate(
         'GoogleAnalyticsImporter_GAImportNoDataScreenStep05',
-        `<a href="${this.indexActionUrl}" target="_blank" rel="noreferrer noopener">`,
+        externalLink(this.indexActionUrl),
         '</a>',
       );
     },

vue/src/ImportScheduler/ImportScheduler.vue

@@ -130,6 +130,7 @@ import {
   NotificationsStore,
   AjaxHelper,
   parseDate,
+  externalLink,
 } from 'CoreHome';
 import { Field } from 'CorePluginsAdmin';
 
@@ -252,10 +253,9 @@ export default defineComponent({
       );
     },
     forceIgnoreOutOfCustomDimSlotErrorHelp() {
-      const url = 'https://matomo.org/docs/custom-dimensions/';
       return translate(
         'GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/docs/custom-dimensions/'),
         '</a>',
       );
     },

vue/src/ImportScheduler/ImportSchedulerGA4.vue

@@ -121,6 +121,7 @@ import {
   NotificationsStore,
   AjaxHelper,
   parseDate,
+  externalLink,
 } from 'CoreHome';
 import { Field } from 'CorePluginsAdmin';
 
@@ -258,10 +259,9 @@ export default defineComponent({
         '</b>');
     },
     forceIgnoreOutOfCustomDimSlotErrorHelp() {
-      const url = 'https://matomo.org/docs/custom-dimensions/';
       return translate(
         'GoogleAnalyticsImporter_ForceCustomDimensionSlotCheckHelp',
-        `<a href="${url}" rel="noreferrer noopener" target="_blank">`,
+        externalLink('https://matomo.org/docs/custom-dimensions/'),
         '</a>',
       );
     },

vue/src/ImportStatus/ImportStatusRow.vue

@@ -162,7 +162,12 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { MatomoUrl, translate, Matomo } from 'CoreHome';
+import {
+  MatomoUrl,
+  translate,
+  Matomo,
+  externalLink,
+} from 'CoreHome';
 
 export default defineComponent({
   props: {
@@ -192,7 +197,7 @@ export default defineComponent({
     errorMessageBugReportRequest() {
       return translate(
         'GoogleAnalyticsImporter_ErrorMessageBugReportRequest',
-        '<a href="https://forum.matomo.org/" rel="noreferrer noopener" target="_blank">',
+        externalLink('https://forum.matomo.org/'),
         '</a>',
       );
     },