Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Actions/Reports')
-rw-r--r--plugins/Actions/Reports/Base.php2
-rw-r--r--plugins/Actions/Reports/GetDownloads.php3
-rw-r--r--plugins/Actions/Reports/GetEntryPageTitles.php12
-rw-r--r--plugins/Actions/Reports/GetEntryPageUrls.php8
-rw-r--r--plugins/Actions/Reports/GetExitPageTitles.php14
-rw-r--r--plugins/Actions/Reports/GetExitPageUrls.php8
-rw-r--r--plugins/Actions/Reports/GetOutlinks.php3
-rw-r--r--plugins/Actions/Reports/GetPageTitles.php10
-rw-r--r--plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php6
-rw-r--r--plugins/Actions/Reports/GetPageUrls.php11
-rw-r--r--plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php8
-rw-r--r--plugins/Actions/Reports/GetSiteSearchCategories.php5
-rw-r--r--plugins/Actions/Reports/GetSiteSearchKeywords.php2
-rw-r--r--plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php5
-rw-r--r--plugins/Actions/Reports/SiteSearchBase.php2
15 files changed, 64 insertions, 35 deletions
diff --git a/plugins/Actions/Reports/Base.php b/plugins/Actions/Reports/Base.php
index 45c9c0af9c..20e35593d8 100644
--- a/plugins/Actions/Reports/Base.php
+++ b/plugins/Actions/Reports/Base.php
@@ -21,7 +21,7 @@ abstract class Base extends \Piwik\Plugin\Report
{
protected function init()
{
- $this->category = 'General_Actions';
+ $this->categoryId = 'General_Actions';
$this->processedMetrics = false;
$this->recursiveLabelSeparator = '/';
}
diff --git a/plugins/Actions/Reports/GetDownloads.php b/plugins/Actions/Reports/GetDownloads.php
index f168cba878..92975b969e 100644
--- a/plugins/Actions/Reports/GetDownloads.php
+++ b/plugins/Actions/Reports/GetDownloads.php
@@ -26,8 +26,7 @@ class GetDownloads extends Base
$this->actionToLoadSubTables = $this->action;
$this->order = 9;
- $this->menuTitle = 'General_Downloads';
- $this->widgetTitle = 'General_Downloads';
+ $this->subcategoryId = 'General_Downloads';
}
public function getMetrics()
diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php
index 7c029f4b02..9df1d74450 100644
--- a/plugins/Actions/Reports/GetEntryPageTitles.php
+++ b/plugins/Actions/Reports/GetEntryPageTitles.php
@@ -15,6 +15,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetEntryPageTitles extends Base
{
@@ -35,8 +38,11 @@ class GetEntryPageTitles extends Base
);
$this->order = 6;
$this->actionToLoadSubTables = $this->action;
+ }
- $this->widgetTitle = 'Actions_WidgetEntryPageTitles';
+ public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)
+ {
+ $widgetsList->addWidgetConfig($factory->createWidget()->setName('Actions_WidgetEntryPageTitles'));
}
public function getProcessedMetrics()
@@ -79,8 +85,8 @@ class GetEntryPageTitles extends Base
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getPageTitles'),
- self::factory('Actions', 'getEntryPageUrls')
+ Reports::factory('Actions', 'getPageTitles'),
+ Reports::factory('Actions', 'getEntryPageUrls')
);
}
}
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php
index f3795db099..c934c7ab10 100644
--- a/plugins/Actions/Reports/GetEntryPageUrls.php
+++ b/plugins/Actions/Reports/GetEntryPageUrls.php
@@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetEntryPageUrls extends Base
{
@@ -40,8 +43,7 @@ class GetEntryPageUrls extends Base
$this->actionToLoadSubTables = $this->action;
- $this->menuTitle = 'Actions_SubmenuPagesEntry';
- $this->widgetTitle = 'Actions_WidgetPagesEntry';
+ $this->subcategoryId = 'Actions_SubmenuPagesEntry';
}
public function getProcessedMetrics()
@@ -83,7 +85,7 @@ class GetEntryPageUrls extends Base
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getEntryPageTitles'),
+ Reports::factory('Actions', 'getEntryPageTitles'),
);
}
}
diff --git a/plugins/Actions/Reports/GetExitPageTitles.php b/plugins/Actions/Reports/GetExitPageTitles.php
index 6cc5b1f320..53f235209d 100644
--- a/plugins/Actions/Reports/GetExitPageTitles.php
+++ b/plugins/Actions/Reports/GetExitPageTitles.php
@@ -15,6 +15,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetExitPageTitles extends Base
{
@@ -37,8 +40,13 @@ class GetExitPageTitles extends Base
$this->order = 7;
$this->actionToLoadSubTables = $this->action;
+ }
- $this->widgetTitle = 'Actions_WidgetExitPageTitles';
+ public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)
+ {
+ // we have to do it manually since it's only done automatically if a subcategoryId is specified,
+ // we do not set a subcategoryId since this report is not supposed to be shown in the UI
+ $widgetsList->addWidgetConfig($factory->createWidget());
}
public function getProcessedMetrics()
@@ -86,8 +94,8 @@ class GetExitPageTitles extends Base
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getPageTitles'),
- self::factory('Actions', 'getExitPageUrls'),
+ Reports::factory('Actions', 'getPageTitles'),
+ Reports::factory('Actions', 'getExitPageUrls'),
);
}
}
diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php
index 2ef5d7a957..f46ac478cd 100644
--- a/plugins/Actions/Reports/GetExitPageUrls.php
+++ b/plugins/Actions/Reports/GetExitPageUrls.php
@@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetExitPageUrls extends Base
{
@@ -40,8 +43,7 @@ class GetExitPageUrls extends Base
$this->order = 4;
- $this->menuTitle = 'Actions_SubmenuPagesExit';
- $this->widgetTitle = 'Actions_WidgetPagesExit';
+ $this->subcategoryId = 'Actions_SubmenuPagesExit';
}
public function getProcessedMetrics()
@@ -97,7 +99,7 @@ class GetExitPageUrls extends Base
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getExitPageTitles'),
+ Reports::factory('Actions', 'getExitPageTitles'),
);
}
diff --git a/plugins/Actions/Reports/GetOutlinks.php b/plugins/Actions/Reports/GetOutlinks.php
index adf21c572c..fb5e13e831 100644
--- a/plugins/Actions/Reports/GetOutlinks.php
+++ b/plugins/Actions/Reports/GetOutlinks.php
@@ -29,8 +29,7 @@ class GetOutlinks extends Base
$this->actionToLoadSubTables = $this->action;
- $this->menuTitle = 'General_Outlinks';
- $this->widgetTitle = 'General_Outlinks';
+ $this->subcategoryId = 'General_Outlinks';
}
public function getMetrics()
diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php
index 8f7e193f9b..0c70086611 100644
--- a/plugins/Actions/Reports/GetPageTitles.php
+++ b/plugins/Actions/Reports/GetPageTitles.php
@@ -17,6 +17,9 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetPageTitles extends Base
{
@@ -40,8 +43,7 @@ class GetPageTitles extends Base
$this->actionToLoadSubTables = $this->action;
- $this->menuTitle = 'Actions_SubmenuPageTitles';
- $this->widgetTitle = 'Actions_WidgetPageTitles';
+ $this->subcategoryId = 'Actions_SubmenuPageTitles';
}
public function getMetrics()
@@ -81,8 +83,8 @@ class GetPageTitles extends Base
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getEntryPageTitles'),
- self::factory('Actions', 'getExitPageTitles'),
+ Reports::factory('Actions', 'getEntryPageTitles'),
+ Reports::factory('Actions', 'getExitPageTitles'),
);
}
}
diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
index 657e88211d..3d50ba4f95 100644
--- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
@@ -15,6 +15,7 @@ use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugin\Reports;
class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
{
@@ -32,7 +33,8 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
new AveragePageGenerationTime()
);
$this->order = 19;
- $this->widgetTitle = 'Actions_WidgetPageTitlesFollowingSearch';
+
+ $this->subcategoryId = 'Actions_SubmenuSitesearch';
}
public function configureView(ViewDataTable $view)
@@ -80,7 +82,7 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getPageUrlsFollowingSiteSearch'),
+ Reports::factory('Actions', 'getPageUrlsFollowingSiteSearch'),
);
}
}
diff --git a/plugins/Actions/Reports/GetPageUrls.php b/plugins/Actions/Reports/GetPageUrls.php
index 0af899ef0e..2c850a5339 100644
--- a/plugins/Actions/Reports/GetPageUrls.php
+++ b/plugins/Actions/Reports/GetPageUrls.php
@@ -15,6 +15,8 @@ use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
use Piwik\Plugins\Actions\Columns\PageUrl;
use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Report\ReportWidgetFactory;
+use Piwik\Widget\WidgetsList;
class GetPageUrls extends Base
{
@@ -37,10 +39,13 @@ class GetPageUrls extends Base
new AveragePageGenerationTime()
);
- $this->segmentSql = 'log_visit.visit_entry_idaction_url';
+ $this->segmentSql = 'log_visit.visit_entry_idaction_url';
+ $this->subcategoryId = 'General_Pages';
+ }
- $this->menuTitle = 'General_Pages';
- $this->widgetTitle = 'General_Pages';
+ public function configureWidgets(WidgetsList $widgetsList, ReportWidgetFactory $factory)
+ {
+ $widgetsList->addWidgetConfig($factory->createWidget()->setName($this->subcategoryId));
}
public function getMetrics()
diff --git a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
index 2d8ba1a3a2..063d3855b5 100644
--- a/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageUrlsFollowingSiteSearch.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Actions\Reports;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
use Piwik\Plugins\Actions\Columns\DestinationPage;
+use Piwik\Plugin\Reports;
class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch
{
@@ -20,8 +21,9 @@ class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch
$this->dimension = new DestinationPage();
$this->name = Piwik::translate('Actions_WidgetPageUrlsFollowingSearch');
$this->documentation = Piwik::translate('Actions_SiteSearchFollowingPagesDoc') . '<br/>' . Piwik::translate('General_UsePlusMinusIconsDocumentation');
- $this->order = 18;
- $this->widgetTitle = 'Actions_WidgetPageUrlsFollowingSearch';
+ $this->order = 16;
+
+ $this->subcategoryId = 'Actions_SubmenuSitesearch';
}
public function configureView(ViewDataTable $view)
@@ -34,7 +36,7 @@ class GetPageUrlsFollowingSiteSearch extends GetPageTitlesFollowingSiteSearch
public function getRelatedReports()
{
return array(
- self::factory('Actions', 'getPageTitlesFollowingSiteSearch'),
+ Reports::factory('Actions', 'getPageTitlesFollowingSiteSearch'),
);
}
}
diff --git a/plugins/Actions/Reports/GetSiteSearchCategories.php b/plugins/Actions/Reports/GetSiteSearchCategories.php
index 6d41e3c334..5388ff9198 100644
--- a/plugins/Actions/Reports/GetSiteSearchCategories.php
+++ b/plugins/Actions/Reports/GetSiteSearchCategories.php
@@ -23,8 +23,9 @@ class GetSiteSearchCategories extends SiteSearchBase
$this->name = Piwik::translate('Actions_WidgetSearchCategories');
$this->documentation = Piwik::translate('Actions_SiteSearchCategories1') . '<br/>' . Piwik::translate('Actions_SiteSearchCategories2');
$this->metrics = array('nb_visits', 'nb_pages_per_search', 'exit_rate');
- $this->order = 17;
- $this->widgetTitle = 'Actions_WidgetSearchCategories';
+ $this->order = 20;
+
+ $this->subcategoryId = 'Actions_SubmenuSitesearch';
}
protected function isEnabledForIdSites($idSites, $idSite)
diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php
index d88684cd15..dc4b5e2d16 100644
--- a/plugins/Actions/Reports/GetSiteSearchKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php
@@ -33,7 +33,7 @@ class GetSiteSearchKeywords extends SiteSearchBase
new AveragePageGenerationTime()
);
$this->order = 15;
- $this->widgetTitle = 'Actions_WidgetSearchKeywords';
+ $this->subcategoryId = 'Actions_SubmenuSitesearch';
}
public function getMetrics()
diff --git a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
index 94b19e8566..c1c01ca504 100644
--- a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
@@ -31,8 +31,9 @@ class GetSiteSearchNoResultKeywords extends SiteSearchBase
new ExitRate(),
new AveragePageGenerationTime()
);
- $this->order = 16;
- $this->widgetTitle = 'Actions_WidgetSearchNoResultKeywords';
+ $this->order = 18;
+
+ $this->subcategoryId = 'Actions_SubmenuSitesearch';
}
public function getMetrics()
diff --git a/plugins/Actions/Reports/SiteSearchBase.php b/plugins/Actions/Reports/SiteSearchBase.php
index e30a2243d8..d4715e04e6 100644
--- a/plugins/Actions/Reports/SiteSearchBase.php
+++ b/plugins/Actions/Reports/SiteSearchBase.php
@@ -18,7 +18,7 @@ abstract class SiteSearchBase extends Base
protected function init()
{
parent::init();
- $this->category = 'Actions_SubmenuSitesearch';
+ $this->categoryId = 'General_Actions';
}
public function isEnabled()