Fixes #6849 Move isPluginActivated to the API/API core API, remove @hideExceptSuperUser from the CoreAdminAPI as it broke this method.

6 files changed, 23 insertions, 41 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index f7aa20d08b..8e87532367 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -516,6 +516,18 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
+     * Return true if plugin is activated, false otherwise
+     *
+     * @param string $pluginName
+     * @return bool
+     */
+    public function isPluginActivated($pluginName)
+    {
+        Piwik::checkUserHasSomeViewAccess();
+        return \Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginName);
+    }
+
+    /**
      * Given a segment, will return a list of the most used values for this particular segment.
      * @param $segmentName
      * @param $idSite
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 92ed49b1b0..00e2095771 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -16,7 +16,6 @@ use Piwik\Site;
 use Piwik\TaskScheduler;
 
 /**
- * @hideExceptForSuperUser
  * @method static \Piwik\Plugins\CoreAdminHome\API getInstance()
  */
 class API extends \Piwik\Plugin\API
@@ -25,6 +24,7 @@ class API extends \Piwik\Plugin\API
      * Will run all scheduled tasks due to run at this time.
      *
      * @return array
+     * @hideExceptForSuperUser
      */
     public function runScheduledTasks()
     {
@@ -33,18 +33,6 @@ class API extends \Piwik\Plugin\API
     }
 
     /**
-     * Return true if plugin is activated, false otherwise
-     *
-     * @param string $pluginName
-     * @return bool
-     */
-    public function isPluginActivated($pluginName)
-    {
-        Piwik::checkUserHasSomeViewAccess();
-        return \Piwik\Plugin\Manager::getInstance()->isPluginActivated($pluginName);
-    }
-
-    /**
      * When tracking data in the past (using Tracking API), this function
      * can be used to invalidate reports for the idSites and dates where new data
      * was added.
@@ -64,6 +52,7 @@ class API extends \Piwik\Plugin\API
      *                      other periods reports processed..
      * @throws Exception
      * @return array
+     * @hideExceptForSuperUser
      */
     public function invalidateArchivedReports($idSites, $dates, $period = false)
     {
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index b16b5add39..a7ee82c6fc 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -47,7 +47,6 @@ class SitesManager extends \Piwik\Plugin
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-helper.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-site.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-core.service.js";
-        $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/multiline-field.directive.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/edit-trigger.directive.js";
         $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/scroll.directive.js";
diff --git a/plugins/SitesManager/angularjs/sites-manager/api-core.service.js b/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
index 493f976d37..fb19897073 100644
--- a/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
+++ b/plugins/SitesManager/angularjs/sites-manager/api-core.service.js
@@ -13,12 +13,17 @@
     function CoreAPIFactory(api) {
 
         return {
-            getIpFromHeader: getIpFromHeader()
+            getIpFromHeader: getIpFromHeader(),
+            isPluginActivated: isPluginActivated()
         };
 
         function getIpFromHeader() {
             return api.fetchApi('API.getIpFromHeader', api.valueAdaptor);
         }
+
+        function isPluginActivated() {
+            return api.fetchApi('API.isPluginActivated', api.valueAdaptor);
+        }
     }
 
 })();
diff --git a/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js b/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js
deleted file mode 100644
index ae02989fde..0000000000
--- a/plugins/SitesManager/angularjs/sites-manager/api-coreadmin.service.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
-    // can probably be shared
-    angular.module('piwikApp').factory('coreAdminAPI', CoreAdminAPIFactory);
-
-    CoreAdminAPIFactory.$inject = ['sitesManagerApiHelper'];
-
-    function CoreAdminAPIFactory(api) {
-
-        return {
-            isPluginActivated: isPluginActivated()
-        };
-
-        function isPluginActivated() {
-            return api.fetchApi('CoreAdminHome.isPluginActivated', api.valueAdaptor);
-        }
-    }
-})();
diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
index 899ee34fe9..886eee213f 100644
--- a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
+++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js
@@ -7,9 +7,9 @@
 (function () {
     angular.module('piwikApp').controller('SitesManagerController', SitesManagerController);
 
-    SitesManagerController.$inject = ['$scope', '$filter', 'coreAPI', 'coreAdminAPI', 'sitesManagerAPI', 'piwik', 'sitesManagerApiHelper'];
+    SitesManagerController.$inject = ['$scope', '$filter', 'coreAPI', 'sitesManagerAPI', 'piwik', 'sitesManagerApiHelper'];
 
-    function SitesManagerController($scope, $filter, coreAPI, coreAdminAPI, sitesManagerAPI, piwik, sitesManagerApiHelper) {
+    function SitesManagerController($scope, $filter, coreAPI, sitesManagerAPI, piwik, sitesManagerApiHelper) {
 
         var translate = $filter('translate');
 
@@ -139,7 +139,7 @@
 
         var initCustomVariablesActivated = function() {
 
-            coreAdminAPI.isPluginActivated(
+            coreAPI.isPluginActivated(
 
                 function (customVariablesActivated) {
                     $scope.customVariablesActivated = customVariablesActivated;