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:
authormattab <matthieu.aubry@gmail.com>2013-07-23 11:52:15 +0400
committermattab <matthieu.aubry@gmail.com>2013-07-23 11:52:15 +0400
commit5104d94f3b2250f766b9c520e2da8da9b4cab2e9 (patch)
tree5f30daf7bc14373fb1bbd0504ce11a771dafc02f /plugins/Widgetize
parentae4b1f4e38077b174e4df5b7d4513d63fe026a24 (diff)
Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes
Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master
Diffstat (limited to 'plugins/Widgetize')
-rw-r--r--plugins/Widgetize/Controller.php22
1 files changed, 13 insertions, 9 deletions
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index dad2506936..c7e80a2464 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -8,25 +8,29 @@
* @category Piwik_Plugins
* @package Piwik_Widgetize
*/
+use Piwik\API\Request;
use Piwik\Common;
+use Piwik\Controller;
+use Piwik\FrontController;
+use Piwik\View;
/**
*
* @package Piwik_Widgetize
*/
-class Piwik_Widgetize_Controller extends Piwik_Controller
+class Piwik_Widgetize_Controller extends Controller
{
public function index()
{
- $view = new Piwik_View('@Widgetize/index');
- $view->availableWidgets = Common::json_encode(Piwik_GetWidgetsList());
+ $view = new View('@Widgetize/index');
+ $view->availableWidgets = Common::json_encode(WidgetsList::get());
$this->setGeneralVariablesView($view);
echo $view->render();
}
public function testJsInclude1()
{
- $view = new Piwik_View('@Widgetize/testJsInclude1');
+ $view = new View('@Widgetize/testJsInclude1');
$view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
$view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
echo $view->render();
@@ -34,7 +38,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
public function testJsInclude2()
{
- $view = new Piwik_View('@Widgetize/testJsInclude2');
+ $view = new View('@Widgetize/testJsInclude2');
$view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
$view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
$view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
@@ -43,16 +47,16 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
public function iframe()
{
- Piwik_API_Request::reloadAuthUsingTokenAuth();
+ Request::reloadAuthUsingTokenAuth();
$this->init();
$controllerName = Common::getRequestVar('moduleToWidgetize');
$actionName = Common::getRequestVar('actionToWidgetize');
$parameters = array($fetch = true);
- $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
+ $outputDataTable = FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
if ($controllerName == 'Dashboard' && $actionName == 'index') {
- $view = new Piwik_View('@Widgetize/iframe_empty');
+ $view = new View('@Widgetize/iframe_empty');
} else {
- $view = new Piwik_View('@Widgetize/iframe');
+ $view = new View('@Widgetize/iframe');
}
$this->setGeneralVariablesView($view);
$view->setXFrameOptions('allow');