diff options
Diffstat (limited to 'plugins/UserSettings/UserSettings.php')
| -rw-r--r-- | plugins/UserSettings/UserSettings.php | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 13b3c4f66a..5da8af6c69 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -1,6 +1,6 @@ <?php /** - * Piwik - Open source web analytics + * Piwik - free/libre analytics platform * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later @@ -13,7 +13,6 @@ use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie; -use Piwik\WidgetsList; /** * @@ -51,7 +50,7 @@ class UserSettings extends \Piwik\Plugin 'resolution', 'log_visit.config_resolution', '1280x1024, 800x600, etc.', - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetBrowsers', @@ -61,7 +60,7 @@ class UserSettings extends \Piwik\Plugin 'browserCode', 'log_visit.config_browser_name', 'FF, IE, CH, SF, OP, etc.', - null,), + null), // browser version array('UserSettings_VisitorSettings', @@ -72,7 +71,7 @@ class UserSettings extends \Piwik\Plugin 'browserVersion', 'log_visit.config_browser_version', '1.0, 8.0, etc.', - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetBrowserFamilies', @@ -82,7 +81,7 @@ class UserSettings extends \Piwik\Plugin null, null, null, - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetPlugins', @@ -92,7 +91,7 @@ class UserSettings extends \Piwik\Plugin null, null, null, - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetWidescreen', @@ -102,7 +101,7 @@ class UserSettings extends \Piwik\Plugin null, null, null, - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetOperatingSystems', @@ -112,7 +111,7 @@ class UserSettings extends \Piwik\Plugin 'operatingSystemCode', 'log_visit.config_os', 'WXP, WI7, MAC, LIN, AND, IPD, etc.', - null,), + null), array('UserSettings_VisitorSettings', 'UserSettings_WidgetGlobalVisitors', @@ -164,7 +163,6 @@ class UserSettings extends \Piwik\Plugin public function getListHooksRegistered() { $hooks = array( - 'WidgetsList.addWidgets' => 'addWidgets', 'API.getReportMetadata' => 'getReportMetadata', 'API.getSegmentDimensionMetadata' => 'getSegmentsMetadata', 'ViewDataTable.configure' => 'configureViewDataTable', @@ -378,6 +376,11 @@ class UserSettings extends \Piwik\Plugin } } + public function getRawReportMetadata() + { + return $this->reportMetadata; + } + /** * Registers reports metadata * @@ -386,7 +389,7 @@ class UserSettings extends \Piwik\Plugin public function getReportMetadata(&$reports) { $i = 0; - foreach ($this->reportMetadata as $report) { + foreach ($this->getRawReportMetadata() as $report) { list($category, $name, $apiModule, $apiAction, $columnName) = $report; if ($category == false) continue; @@ -443,17 +446,4 @@ class UserSettings extends \Piwik\Plugin } } - /** - * Adds the various User Settings widgets - */ - function addWidgets() - { - // in this case, Widgets have same names as API reports - foreach ($this->reportMetadata as $report) { - list($category, $name, $controllerName, $controllerAction) = $report; - if ($category == false) continue; - WidgetsList::add($category, $name, $controllerName, $controllerAction); - } - } - } |