diff options
author | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-03 08:49:45 +0300 |
---|---|---|
committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-01-03 08:49:45 +0300 |
commit | 956c25213d771f37f7ed51bd56b0788be05e6603 (patch) | |
tree | 83533901bd264f738f77350755112e9b304efe6e /plugins/Live/Controller.php | |
parent | 97d410fd5c78155ea744a1b0fe6aae074e5f72bb (diff) |
Various code cleanups and small improvements:
* Live! widget shows IP for all users except anonymous
* Widgetize displays full URL to the widget + preview link below widget
* Live! visitors text change from "Today" to "Last 24 hours" in preview
* remove data_push feature introduced in r1330 + removing campaign redirect feature since they are not used
* all errors should now display the Piwik header when applicable (or if a php error, prefixed with a sentence suggesting to submit error in piwik forums)
* fixing bug with cookie update when a visitor manually converts the same goal in the same second
* fixing XML output not valid in Chrome (HTML entities not valid, must use XML entities)
* simplifying + refactoring the truncation code in datatables.js (move from JS to small smarty template - hopefully we can fix this truncation and make it nice soon)
* removing unnecessary line breaks from translations
* refactoring duplicate code in renderers
git-svn-id: http://dev.piwik.org/svn/trunk@3565 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Live/Controller.php')
-rw-r--r-- | plugins/Live/Controller.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index 3d166a8207..c84bdfe477 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -18,7 +18,6 @@ class Piwik_Live_Controller extends Piwik_Controller function __construct() { parent::__construct(); - $this->idSite = Piwik_Common::getRequestVar('idSite'); $this->minIdVisit = Piwik_Common::getRequestVar('minIdVisit', 0, 'int'); } @@ -30,7 +29,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function widget($fetch = false) { $view = Piwik_View::factory('index'); - $view->idSite = Piwik_Common::getRequestVar('idSite'); + $view->idSite = $this->idSite; $view->visitorsCountHalfHour = $this->getUsersInLastXMin(30); $view->visitorsCountToday = $this->getUsersInLastXDays(1); $view->pisHalfhour = $this->getPageImpressionsInLastXMin(30); @@ -77,7 +76,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function getLastVisitsStart($fetch = false) { $view = Piwik_View::factory('lastVisits'); - $view->idSite = Piwik_Common::getRequestVar('idSite'); + $view->idSite = $this->idSite; $view->visitors = $this->getLastVisits(10); @@ -129,7 +128,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function ajaxTotalVisitors($fetch = false) { $view = Piwik_View::factory('totalVisits'); - $view->idSite = Piwik_Common::getRequestVar('idSite'); + $view->idSite = $this->idSite; $view->visitorsCountHalfHour = $this->getUsersInLastXMin(30); $view->visitorsCountToday = $this->getUsersInLastXDays(1); $view->pisHalfhour = $this->getPageImpressionsInLastXMin(30); |