Converted Widgetize plugin to Twig

1 files changed, 9 insertions, 25 deletions

diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index 6441a84b48..e478d992c8 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -15,48 +15,32 @@
  */
 class Piwik_Widgetize_Controller extends Piwik_Controller
 {
-    function index()
+    public function index()
     {
-        $view = Piwik_View::factory('index');
+        $view = new Piwik_View('@Widgetize/index');
         $view->availableWidgets = Piwik_Common::json_encode(Piwik_GetWidgetsList());
         $this->setGeneralVariablesView($view);
         echo $view->render();
     }
 
-    function testJsInclude1()
+    public function testJsInclude1()
     {
-        $view = Piwik_View::factory('test_jsinclude');
+        $view = new Piwik_View('@Widgetize/test_jsinclude');
         $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();
     }
 
-    function testJsInclude2()
+    public function testJsInclude2()
     {
-        $view = Piwik_View::factory('test_jsinclude2');
+        $view = new Piwik_View('@Widgetize/test_jsinclude2');
         $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';
         echo $view->render();
     }
 
-    /**
-     * Disabled for now, not obvious that this is useful (iframe sounds like a better solution)
-     */
-    private function js()
-    {
-        Piwik_API_Request::reloadAuthUsingTokenAuth();
-        $controllerName = Piwik_Common::getRequestVar('moduleToWidgetize');
-        $actionName = Piwik_Common::getRequestVar('actionToWidgetize');
-        $parameters = array($fetch = true);
-        $content = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
-        $view = Piwik_View::factory('js');
-        $content = str_replace(array("\t", "\n", "\r\n", "\r"), "", $content);
-        $view->content = $content;
-        echo $view->render();
-    }
-
-    function iframe()
+    public function iframe()
     {
         Piwik_API_Request::reloadAuthUsingTokenAuth();
         $this->init();
@@ -65,9 +49,9 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
         $parameters = array($fetch = true);
         $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
-            $view = Piwik_View::factory('empty');
+            $view = new Piwik_View('@Widgetize/empty');
         } else {
-            $view = Piwik_View::factory('iframe');
+            $view = new Piwik_View('@Widgetize/iframe');
         }
         $this->setGeneralVariablesView($view);
         $view->setXFrameOptions('allow');