diff options
author | Stefan Giehl <stefan@piwik.org> | 2018-03-23 02:51:24 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-03-23 02:51:24 +0300 |
commit | c61018b5b4676b9e0f5b500cca592007c22c1153 (patch) | |
tree | 1b4b70ff84b632a6713507209da68c6b61b99861 /plugins/Marketplace | |
parent | 4ed366ae6ec2697c525943395499b3dcb51dc2aa (diff) |
Hide widgets not working without internet connection if disabled in config (#12279)
* Hide SEO rankings widget if internet is disabled in config
* Hide RSS widgets if internet is disabled in config
* Remove more wirdgets when internet connection disabled
* Adjust widgets to remove after rename to Matomo
* Code improvements
Diffstat (limited to 'plugins/Marketplace')
-rw-r--r-- | plugins/Marketplace/Marketplace.php | 17 | ||||
-rw-r--r-- | plugins/Marketplace/Widgets/GetNewPlugins.php | 14 | ||||
-rw-r--r-- | plugins/Marketplace/Widgets/GetPremiumFeatures.php | 14 |
3 files changed, 41 insertions, 4 deletions
diff --git a/plugins/Marketplace/Marketplace.php b/plugins/Marketplace/Marketplace.php index c906cb0454..a274094544 100644 --- a/plugins/Marketplace/Marketplace.php +++ b/plugins/Marketplace/Marketplace.php @@ -9,7 +9,12 @@ namespace Piwik\Plugins\Marketplace; use Piwik\Container\StaticContainer; +use Piwik\Piwik; use Piwik\Plugin; +use Piwik\Plugins\Marketplace\Widgets\GetNewPlugins; +use Piwik\Plugins\Marketplace\Widgets\GetPremiumFeatures; +use Piwik\SettingsPiwik; +use Piwik\Widget\WidgetsList; class Marketplace extends \Piwik\Plugin { @@ -23,6 +28,7 @@ class Marketplace extends \Piwik\Plugin 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys', 'Controller.CoreHome.checkForUpdates' => 'checkForUpdates', + 'Widget.filterWidgets' => 'filterWidgets' ); } @@ -55,6 +61,17 @@ class Marketplace extends \Piwik\Plugin $translationKeys[] = 'Marketplace_LicenseKeyDeletedSuccess'; } + /** + * @param WidgetsList $list + */ + public function filterWidgets($list) + { + if (!SettingsPiwik::isInternetEnabled()) { + $list->remove(GetPremiumFeatures::getCategory(), GetPremiumFeatures::getName()); + $list->remove(GetNewPlugins::getCategory(), GetNewPlugins::getName()); + } + } + public static function isMarketplaceEnabled() { return self::getPluginManager()->isPluginActivated('Marketplace'); diff --git a/plugins/Marketplace/Widgets/GetNewPlugins.php b/plugins/Marketplace/Widgets/GetNewPlugins.php index 4f814a6d7e..4503767a95 100644 --- a/plugins/Marketplace/Widgets/GetNewPlugins.php +++ b/plugins/Marketplace/Widgets/GetNewPlugins.php @@ -27,10 +27,20 @@ class GetNewPlugins extends Widget $this->marketplaceApiClient = $marketplaceApiClient; } + public static function getCategory() + { + return 'About Matomo'; + } + + public static function getName() + { + return 'Latest Marketplace Updates'; + } + public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Matomo'); - $config->setName('Latest Marketplace Updates'); + $config->setCategoryId(self::getCategory()); + $config->setName(self::getName()); $config->setOrder(19); } diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php index a928be6067..02726f7718 100644 --- a/plugins/Marketplace/Widgets/GetPremiumFeatures.php +++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php @@ -29,10 +29,20 @@ class GetPremiumFeatures extends Widget $this->marketplaceApiClient = $marketplaceApiClient; } + public static function getCategory() + { + return 'About Matomo'; + } + + public static function getName() + { + return Piwik::translate('Marketplace_PaidPlugins'); + } + public static function configure(WidgetConfig $config) { - $config->setCategoryId('About Matomo'); - $config->setName(Piwik::translate('Marketplace_PaidPlugins')); + $config->setCategoryId(self::getCategory()); + $config->setName(self::getName()); $config->setOrder(20); } |