Ticket #1120: Live2.patch

plugins/Live/API.php

@@ -68 +68 @@
         public function getLastVisits( $idSite = false, $limit = 10, $minIdVisit = false )
         {
                 // for checking given vars
-                // echo $idSite.'|'.$limit.'|'.$minIdVisit.'<br />';
+                //  echo $idSite.'|'.$limit.'|'.$minIdVisit.'<br />';
                 if(is_null($idSite))
                 {
                         Piwik::checkUserIsSuperUser();

plugins/Live/Controller.php

@@ -32 +32 @@
         public function widget($fetch = false)
         {
                 $view = Piwik_View::factory('index');
-                $this->setGeneralVariablesView($view);
+//              $this->setGeneralVariablesView($view);
+                $view->idSite = Piwik_Common::getRequestVar('idSite');
+                
                 $view->visitorsCountHalfHour = $this->getUsersInLastXMin(30);
                 $view->visitorsCountToday = $this->getUsersInLastXDays(1);
                 $view->pisHalfhour = $this->getPageImpressionsInLastXMin(30);
@@ -124 +126 @@
         public function getLastVisitsStart($fetch = false)
         {
                 $view = Piwik_View::factory('lastVisits');
-                $this->setGeneralVariablesView($view);
+//              $this->setGeneralVariablesView($view);
+                $view->idSite = Piwik_Common::getRequestVar('idSite');
+                
                 $view->visitors = $this->getLastVisits(10);
 
                 $rendered = $view->render($fetch);
@@ -175 +179 @@
         public function ajaxTotalVisitors($fetch = false)
         {
                 $view = Piwik_View::factory('totalVisits');
-                $this->setGeneralVariablesView($view);
+//              $this->setGeneralVariablesView($view);
+                $view->idSite = Piwik_Common::getRequestVar('idSite');
+                
                 $view->visitorsCountHalfHour = $this->getUsersInLastXMin(30);
                 $view->visitorsCountToday = $this->getUsersInLastXDays(1);
                 $view->pisHalfhour = $this->getPageImpressionsInLastXMin(30);
                 $view->pisToday = $this->getPageImpressionsInLastXDays(1);
 
-                echo $view->render();
+                $rendered = $view->render($fetch);
+
+                if($fetch)
+                {
+                        return $rendered;
+                }
+                echo $rendered;         
         }
+        
 }