@@ -11,7 +11,7 @@

class LeftMenu extends \Piwik\Plugin
{
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getStylesheetFiles' => array('function' => 'getStylesheetFiles', 'after' => true),
@@ -10,18 +10,16 @@

use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;

require_once PIWIK_INCLUDE_PATH . '/plugins/Live/VisitorLog.php';

/**
*
*/
class Live extends \Piwik\Plugin
{

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -10,7 +10,7 @@

use Piwik\Menu\MenuReporting;
use Piwik\Plugin\Report;
use Piwik\Plugins\Live\VisitorLog;
use Piwik\Plugins\Live\Visualizations\VisitorLog;
use Piwik\WidgetsList;

class GetLastVisitsDetails extends Base
@@ -13,7 +13,6 @@
use Piwik\Piwik;
use Piwik\Plugin\Report;
use Piwik\Plugins\Live\Controller;
use Piwik\Plugins\Live\VisitorLog;
use Piwik\API\Request;
use Piwik\View;

@@ -383,7 +383,6 @@ public static function enrichVisitorArrayWithActions($visitorDetailsArray, $acti
}

$actions = array_merge($actionDetails, $goalDetails, $ecommerceDetails);

usort($actions, array('static', 'sortByServerTime'));

foreach ($actions as &$action) {
@@ -6,10 +6,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
namespace Piwik\Plugins\Live;
namespace Piwik\Plugins\Live\Visualizations;

use Piwik\Common;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
use Piwik\Plugin\Visualization;
use Piwik\View;

@@ -20,8 +21,10 @@
*/
class VisitorLog extends Visualization
{
const ID = 'Piwik\Plugins\Live\VisitorLog';
const ID = 'VisitorLog';
const TEMPLATE_FILE = "@Live/_dataTableViz_visitorLog.twig";
const FOOTER_ICON_TITLE = '';
const FOOTER_ICON = '';

public static function getDefaultConfig()
{
@@ -90,4 +93,9 @@ public function beforeRender()
)
);
}

public static function canDisplayViewDataTable(ViewDataTable $view)
{
return ($view->requestConfig->getApiModuleToRequest() === 'Live');
}
}
@@ -7,7 +7,7 @@
*
*/

namespace Piwik\Plugins\Live\VisitorLog;
namespace Piwik\Plugins\Live\Visualizations\VisitorLog;

use Piwik\ViewDataTable\Config as VisualizationConfig;

@@ -23,9 +23,9 @@
class Login extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
$hooks = array(
'Request.initAuthenticationObject' => 'initAuthenticationObject',
@@ -61,9 +61,9 @@ class MobileMessaging extends \Piwik\Plugin
);

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -13,9 +13,9 @@
class MultiSites extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
@@ -12,9 +12,9 @@
class Overlay extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
function getListHooksRegistered()
function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -130,9 +130,9 @@ public static function hasReportBeenPurged($dataTable)
}

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -18,9 +18,9 @@
class Provider extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails'
@@ -310,7 +310,7 @@ function getKeywordsForPage()
// HTML
$api = SettingsPiwik::getPiwikUrl()
. '?module=API&method=Referrers.getKeywordsForPageUrl'
. '&format=php'
. '&format=json'
. '&filter_limit=10'
. '&token_auth=' . Piwik::getCurrentUserTokenAuth();

@@ -325,7 +325,8 @@ function DisplayTopKeywords($url = "")
// Get the Keywords data
$url = empty($url) ? "http://". $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"] : $url;
$api = "' . $api . '&url=" . urlencode($url);
$keywords = @unserialize(file_get_contents($api));
$keywords = @json_decode(file_get_contents($api), $assoc = true);
Common::sendHeader(\'Content-Type: text/html; charset=utf-8\', true);
if ($keywords === false || isset($keywords["result"])) {
// DEBUG ONLY: uncomment for troubleshooting an empty output (the URL output reveals the token_auth)
// echo "Error while fetching the <a href=\'$api\'>Top Keywords from Piwik</a>";
@@ -362,7 +363,8 @@ function DisplayTopKeywords($url = "", $api)
// Get the Keywords data
$url = empty($url) ? "http://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"] : $url;
$api = $api . "&url=" . urlencode($url);
$keywords = @unserialize(file_get_contents($api));
$keywords = @json_decode(file_get_contents($api), $assoc = true);
Common::sendHeader('Content-Type: text/html; charset=utf-8', true);
if ($keywords === false || isset($keywords["result"])) {
// DEBUG ONLY: uncomment for troubleshooting an empty output (the URL output reveals the token_auth)
//echo "Error while fetching the <a href=\'".$api."\'>Top Keywords from Piwik</a>";
@@ -23,9 +23,9 @@
class Referrers extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Insights.addReportToOverview' => 'addReportToInsightsOverview',
@@ -17,9 +17,9 @@
class Resolution extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
@@ -71,9 +71,9 @@ class ScheduledReports extends \Piwik\Plugin
const OPTION_KEY_LAST_SENT_DATERANGE = 'report_last_sent_daterange_';

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -18,9 +18,9 @@
class SegmentEditor extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Segments.getKnownSegmentsToArchiveForSite' => 'getKnownSegmentsToArchiveForSite',
@@ -26,9 +26,9 @@ class SitesManager extends \Piwik\Plugin
const KEEP_URL_FRAGMENT_NO = 2;

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -14,9 +14,9 @@
class Transitions extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
@@ -28,9 +28,9 @@
class UserCountry extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
@@ -29,7 +29,7 @@ public static function insertMapInLocationReport(&$out)
$out .= FrontController::getInstance()->fetchDispatch('UserCountryMap', 'visitorMap');
}

public function getListHooksRegistered()
public function registerEvents()
{
$hooks = array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -17,9 +17,9 @@
class UserLanguage extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails'
@@ -24,9 +24,9 @@ class UsersManager extends \Piwik\Plugin
const PASSWORD_MAX_LENGTH = 80;

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -14,9 +14,9 @@
class VisitFrequency extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations'
@@ -12,9 +12,9 @@
class VisitTime extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
@@ -19,9 +19,9 @@ class VisitorInterest extends \Piwik\Plugin
{

/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
@@ -21,9 +21,9 @@
class VisitsSummary extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
@@ -13,9 +13,9 @@
class Widgetize extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -13,9 +13,9 @@
class ZenMode extends \Piwik\Plugin
{
/**
* @see Piwik\Plugin::getListHooksRegistered
* @see Piwik\Plugin::registerEvents
*/
public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -45,7 +45,7 @@ function __construct($name)
$this->pluginName = $name;
}

public function getListHooksRegistered()
public function registerEvents()
{
return array(
'AssetManager.getJavaScriptFiles' => 'getJsFiles',
@@ -69,6 +69,7 @@ public function test_deprecations()

$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add');
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Archive', 'getDataTableFromArchive');
$this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Plugin', 'getListHooksRegistered');
}

private function assertDeprecatedMethodIsRemoved($className, $method, $removalDate)