Skip to content

Commit

Permalink
refs #4134 renamed some more hooks and removed some not used and not …
Browse files Browse the repository at this point in the history
…needed hooks
  • Loading branch information
tsteur committed Oct 2, 2013
1 parent cc422d3 commit f185beb
Show file tree
Hide file tree
Showing 51 changed files with 604 additions and 64 deletions.
6 changes: 0 additions & 6 deletions core/Common.php
Expand Up @@ -770,12 +770,6 @@ public static function getBrowserLanguage($browserLang = null)
*/
public static function getCountry($lang, $enableLanguageToCountryGuess, $ip)
{
$country = null;
Piwik_PostEvent('Request.getCountry', array(&$country, $ip));
if (!empty($country)) {
return strtolower($country);
}

if (empty($lang) || strlen($lang) < 2 || $lang == 'xx') {
return 'xx';
}
Expand Down
2 changes: 0 additions & 2 deletions core/Controller.php
Expand Up @@ -634,8 +634,6 @@ protected function getDefaultWebsiteId()
$defaultWebsiteId = $defaultReport;
}

Piwik_PostEvent('User.getDefaultWebsiteId', array(&$defaultWebsiteId));

if ($defaultWebsiteId) {
return $defaultWebsiteId;
}
Expand Down
4 changes: 2 additions & 2 deletions core/Menu/Admin.php
Expand Up @@ -32,14 +32,14 @@ static public function getInstance()
}

/**
* Triggers the AdminMenu.addMenuEntries hook and returns the menu.
* Triggers the Menu.Admin.addItems hook and returns the menu.
*
* @return Array
*/
public function get()
{
if (!$this->menu) {
Piwik_PostEvent('AdminMenu.addMenuEntries');
Piwik_PostEvent('Menu.Admin.addItems');
}
return parent::get();
}
Expand Down
4 changes: 2 additions & 2 deletions core/Menu/Main.php
Expand Up @@ -51,15 +51,15 @@ public function isUrlFound($url)
}

/**
* Triggers the Menu.addMenuEntries hook and returns the menu.
* Triggers the Menu.Reporting.addItems hook and returns the menu.
*
* @return Array
*/
public function get()
{
// We trigger the Event only once!
if (!$this->menu) {
Piwik_PostEvent('Menu.addMenuEntries');
Piwik_PostEvent('Menu.Reporting.addItems');

This comment has been minimized.

Copy link
@halfdan

halfdan Oct 2, 2013

Member

Wouldn't Menu.Main.addItems make more sense? Looking at the UI the menu really looks like a main menu. Admin and Top menu describe positions, where Reporting describes the type of menu.

}
return parent::get();
}
Expand Down
4 changes: 2 additions & 2 deletions core/Menu/Top.php
Expand Up @@ -52,14 +52,14 @@ public function addHtml($menuName, $data, $displayedForCurrentUser, $order, $too
}

/**
* Triggers the TopMenu.addMenuEntries hook and returns the menu.
* Triggers the Menu.Top.addItems hook and returns the menu.
*
* @return Array
*/
public function get()
{
if (!$this->menu) {
Piwik_PostEvent('TopMenu.addMenuEntries');
Piwik_PostEvent('Menu.Top.addItems');
}
return parent::get();
}
Expand Down
9 changes: 1 addition & 8 deletions core/Tracker/Visit.php
Expand Up @@ -909,14 +909,7 @@ protected function isVisitorKnown()
*/
protected function newAction()
{
$action = null;
Piwik_PostEvent('Tracker.createNewAction', array(&$action));

if (is_null($action)) {
$action = new Action($this->request);
} elseif (!($action instanceof ActionInterface)) {
throw new Exception("The Action object set in the plugin must implement the interface ActionInterface");
}
$action = new Action($this->request);
return $action;
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/API/API.php
Expand Up @@ -649,7 +649,7 @@ public function getListHooksRegistered()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'TopMenu.addMenuEntries' => 'addTopMenu',
'Menu.Top.addItems' => 'addTopMenu',
);
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Actions/Actions.php
Expand Up @@ -57,7 +57,7 @@ public function getListHooksRegistered()
'ArchiveProcessing_Day.compute' => 'archiveDay',
'ArchiveProcessor.Period.compute' => 'archivePeriod',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.addMenuEntries' => 'addMenus',
'Menu.Reporting.addItems' => 'addMenus',
'API.getReportMetadata' => 'getReportMetadata',
'API.getSegmentsMetadata' => 'getSegmentsMetadata',
'Visualization.getReportDisplayProperties' => 'getReportDisplayProperties',
Expand Down
2 changes: 1 addition & 1 deletion plugins/CoreAdminHome/CoreAdminHome.php
Expand Up @@ -32,7 +32,7 @@ public function getListHooksRegistered()
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AdminMenu.addMenuEntries' => 'addMenu',
'Menu.Admin.addItems' => 'addMenu',
'TaskScheduler.getScheduledTasks' => 'getScheduledTasks',
);
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/CorePluginsAdmin/CorePluginsAdmin.php
Expand Up @@ -26,7 +26,7 @@ class CorePluginsAdmin extends \Piwik\Plugin
public function getListHooksRegistered()
{
return array(
'AdminMenu.addMenuEntries' => 'addMenu',
'Menu.Admin.addItems' => 'addMenu',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'TaskScheduler.getScheduledTasks' => 'getScheduledTasks',
Expand Down
2 changes: 1 addition & 1 deletion plugins/CustomVariables/CustomVariables.php
Expand Up @@ -36,7 +36,7 @@ public function getListHooksRegistered()
'ArchiveProcessor.Day.compute' => 'archiveDay',
'ArchiveProcessor.Period.compute' => 'archivePeriod',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.addMenuEntries' => 'addMenus',
'Menu.Reporting.addItems' => 'addMenus',
'Goals.getReportsWithGoalMetrics' => 'getReportsWithGoalMetrics',
'API.getReportMetadata' => 'getReportMetadata',
'API.getSegmentsMetadata' => 'getSegmentsMetadata',
Expand Down
2 changes: 1 addition & 1 deletion plugins/DBStats/DBStats.php
Expand Up @@ -32,7 +32,7 @@ public function getListHooksRegistered()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'AdminMenu.addMenuEntries' => 'addMenu',
'Menu.Admin.addItems' => 'addMenu',
'TaskScheduler.getScheduledTasks' => 'getScheduledTasks',
'Visualization.getReportDisplayProperties' => 'getReportDisplayProperties',
);
Expand Down
4 changes: 2 additions & 2 deletions plugins/Dashboard/Dashboard.php
Expand Up @@ -31,8 +31,8 @@ public function getListHooksRegistered()
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'UsersManager.deleteUser' => 'deleteDashboardLayout',
'Menu.addMenuEntries' => 'addMenus',
'TopMenu.addMenuEntries' => 'addTopMenu',
'Menu.Reporting.addItems' => 'addMenus',
'Menu.Top.addItems' => 'addTopMenu',
'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
);
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/DevicesDetection/DevicesDetection.php
Expand Up @@ -63,7 +63,7 @@ public function getListHooksRegistered()
return array(
'ArchiveProcessor.Day.compute' => 'archiveDay',
'ArchiveProcessor.Period.compute' => 'archivePeriod',
'Menu.addMenuEntries' => 'addMenu',
'Menu.Reporting.addItems' => 'addMenu',
'Tracker.newVisitorInformation' => 'parseMobileVisitData',
'WidgetsList.addWidgets' => 'addWidgets',
'API.getReportMetadata' => 'getReportMetadata',
Expand Down
2 changes: 1 addition & 1 deletion plugins/ExampleUI/ExampleUI.php
Expand Up @@ -33,7 +33,7 @@ class ExampleUI extends \Piwik\Plugin
public function getListHooksRegistered()
{
$hooks = array(
'Menu.addMenuEntries' => 'addMenus',
'Menu.Reporting.addItems' => 'addMenus',
);
return $hooks;
}
Expand Down
8 changes: 4 additions & 4 deletions plugins/Feedback/Feedback.php
Expand Up @@ -24,10 +24,10 @@ class Feedback extends \Piwik\Plugin
public function getListHooksRegistered()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'TopMenu.addMenuEntries' => 'addTopMenu',
'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'Menu.Top.addItems' => 'addTopMenu',
'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
);
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Goals/Goals.php
Expand Up @@ -96,7 +96,7 @@ public function getListHooksRegistered()
'API.getReportMetadata.end' => 'getReportMetadata',
'API.getSegmentsMetadata' => 'getSegmentsMetadata',
'WidgetsList.addWidgets' => 'addWidgets',
'Menu.addMenuEntries' => 'addMenus',
'Menu.Reporting.addItems' => 'addMenus',
'SitesManager.deleteSite.end' => 'deleteSiteGoals',
'Goals.getReportsWithGoalMetrics' => 'getActualReportsWithGoalMetrics',
'Visualization.getReportDisplayProperties' => 'getReportDisplayProperties',
Expand Down
2 changes: 1 addition & 1 deletion plugins/Installation/Installation.php
Expand Up @@ -30,7 +30,7 @@ public function getListHooksRegistered()
$hooks = array(
'Config.NoConfigurationFile' => 'dispatch',
'Config.badConfigurationFile' => 'dispatch',
'AdminMenu.addMenuEntries' => 'addMenu',
'Menu.Admin.addItems' => 'addMenu',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
);
return $hooks;
Expand Down
2 changes: 1 addition & 1 deletion plugins/LanguagesManager/LanguagesManager.php
Expand Up @@ -35,7 +35,7 @@ public function getListHooksRegistered()
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'TopMenu.addMenuEntries' => 'showLanguagesSelector',
'Menu.Top.addItems' => 'showLanguagesSelector',
'User.getLanguage' => 'getLanguageToLoad',
'UsersManager.deleteUser' => 'deleteUserLanguage',
'Template.topBar' => 'addLanguagesManagerToOtherTopBar',
Expand Down
2 changes: 1 addition & 1 deletion plugins/Live/Live.php
Expand Up @@ -45,7 +45,7 @@ public function getListHooksRegistered()
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
'WidgetsList.addWidgets' => 'addWidget',
'Menu.addMenuEntries' => 'addMenu',
'Menu.Reporting.addItems' => 'addMenu',
'Visualization.getReportDisplayProperties' => 'getReportDisplayProperties',
'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys',
);
Expand Down
100 changes: 100 additions & 0 deletions plugins/LiveTab/API.php
@@ -0,0 +1,100 @@
<?php
/**
* Piwik - Open source web analytics
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* @category Piwik_Plugins
* @package Piwik_LiveTab
*/

namespace Piwik\Plugins\LiveTab;

use Piwik\Piwik;

/**
* @package Piwik_LiveTab
*/
class API
{
/**
* @var API
*/
static private $instance = null;

/**
* @return API
*/
static public function getInstance()
{
if (null == self::$instance) {
self::$instance = new self;
}

return self::$instance;
}

public function setSettings($metric, $lastMinutes, $refreshInterval)
{
// TODO add login as parameter
Piwik::checkUserHasSomeViewAccess();

if (!$this->isAllowedMetric($metric)) {
throw new \Exception(Piwik_TranslateException('LiveTab_InvalidMetric'));
}

$lastMinutes = (int) $lastMinutes;
$refreshInterval = (int) $refreshInterval;

$login = Piwik::getCurrentUserLogin();

$model = new Model($login);
$model->setSettings($metric, $lastMinutes, $refreshInterval);
}

public function getSettings()
{
// TODO add login as parameter

Piwik::checkUserHasSomeViewAccess();

$login = Piwik::getCurrentUserLogin();

$model = new Model($login);
$settings = $model->getSettings();

if (empty($settings)) {
return $this->getDefaultSettings();
}

return array(
'metric' => $settings['metric'],
'lastMinutes' => $settings['last_minutes'],
'refreshInterval' => $settings['refresh_interval']
);
}

public function getAvailableMetrics()
{
return array(
'visits' => Piwik_Translate('General_ColumnNbVisits'),
'actions' => Piwik_Translate('General_ColumnNbActions'),
'visitsConverted' => Piwik_Translate('Goals_GoalConversions'),
'visitors' => Piwik_Translate('General_ColumnNbUniqVisitors')
);
}

private function getDefaultSettings()
{
return array(
'metric' => LiveTab::$defaultMetricToDisplay,
'lastMinutes' => LiveTab::$defaultLastMinutes,
'refreshInterval' => LiveTab::$defaultRefreshInterval
);
}

private function isAllowedMetric($metric)
{
return in_array($metric, array_keys($this->getAvailableMetrics()));
}
}
42 changes: 42 additions & 0 deletions plugins/LiveTab/Controller.php
@@ -0,0 +1,42 @@
<?php
/**
* Piwik - Open source web analytics
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
* @category Piwik_Plugins
* @package Piwik_LiveTab
*/

namespace Piwik\Plugins\LiveTab;

use Piwik\Controller\Admin;
use Piwik\Piwik;
use Piwik\View;

/**
*
* @package Piwik_LiveTab
*/
class Controller extends Admin
{
public function index()
{
Piwik::checkUserIsNotAnonymous();

$view = new View('@LiveTab/index');

$api = new API();
$settings = $api->getSettings();

$view->metricToDisplay = $settings['metric'];
$view->lastMinutes = $settings['lastMinutes'];
$view->refreshInterval = $settings['refreshInterval'];
$view->availableMetrics = $api->getAvailableMetrics();

$this->setBasicVariablesView($view);

echo $view->render();
}
}

0 comments on commit f185beb

Please sign in to comment.