Fix permission checks for siteWithoutData methods (#17694)

1 files changed, 4 insertions, 7 deletions

diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index deceee4515..1b171533c0 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -128,17 +128,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
     public function siteWithoutData()
     {
+        $this->checkSitePermission();
+
         $javascriptGenerator = new TrackerCodeGenerator();
         $javascriptGenerator->forceMatomoEndpoint();
         $piwikUrl = Url::getCurrentUrlWithoutFileName();
 
-        if (!$this->site && Piwik::hasUserSuperUserAccess()) {
-            throw new UnexpectedWebsiteFoundException('Invalid site ' . $this->idSite);
-        } elseif (!$this->site) {
-            // redirect to login form
-            Piwik::checkUserHasViewAccess($this->idSite);
-        }
-
         $jsTag = Request::processRequest('SitesManager.getJavascriptTag', array('idSite' => $this->idSite, 'piwikUrl' => $piwikUrl));
 
         // Strip off open and close <script> tag and comments so that JS will be displayed in ALL mail clients
@@ -169,6 +164,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     }
 
     public function siteWithoutDataTabs() {
+        $this->checkSitePermission();
+
         $mainUrl = $this->site->getMainUrl();
         $typeCacheId = 'guessedtype_' . md5($mainUrl);
         $gtmCacheId = 'guessedgtm_' . md5($mainUrl);