Merge pull request #645 from matomo-org/port-as685

Port the escaped Matomo domain to 6.x, #AS-685

Author: AltamashShaikh

Importer.php

@@ -288,7 +288,7 @@ private function importCustomVariableSlots()
         $command = "php " . PIWIK_INCLUDE_PATH . '/console';
         $domain = Config::getInstance()->getConfigHostnameIfSet();
         if (!empty($domain)) {
-            $command .= ' --matomo-domain=' . $domain;
+            $command .= ' --matomo-domain=' . escapeshellarg($domain);
         }
         $command .= ' customvariables:set-max-custom-variables ' . $numCustomVarSlots;
         passthru($command);

ImporterGA4.php

@@ -340,7 +340,7 @@ private function importCustomVariableSlots()
         $command = "php " . PIWIK_INCLUDE_PATH . '/console';
         $domain = Config::getInstance()->getConfigHostnameIfSet();
         if (!empty($domain)) {
-            $command .= ' --matomo-domain=' . $domain;
+            $command .= ' --matomo-domain=' . escapeshellarg($domain);
         }
         $command .= ' customvariables:set-max-custom-variables ' . $numCustomVarSlots;
         passthru($command);