update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/Widgetize/Controller.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -22,43 +22,33 @@ class Controller extends \Piwik\Plugin\Controller
     public function index()
     {
         $view = new View('@Widgetize/index');
-        $view->availableWidgets = Common::json_encode(WidgetsList::get());
+        $view->availableWidgets = json_encode(WidgetsList::get());
         $this->setGeneralVariablesView($view);
         return $view->render();
     }
 
-    public function 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';
-        return $view->render();
-    }
-
-    public function 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=Referrers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
-        return $view->render();
-    }
-
     public function iframe()
     {
         Request::reloadAuthUsingTokenAuth();
         $this->init();
+
         $controllerName = Common::getRequestVar('moduleToWidgetize');
-        $actionName = Common::getRequestVar('actionToWidgetize');
-        $outputDataTable = FrontController::getInstance()->fetchDispatch($controllerName, $actionName);
+        $actionName     = Common::getRequestVar('actionToWidgetize');
+
+        if($controllerName == 'API') {
+            throw new \Exception("Widgetizing API requests is not supported for security reasons. Please change query parameter 'moduleToWidgetize'.");
+        }
+
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
             $view = new View('@Widgetize/iframe_empty');
         } else {
             $view = new View('@Widgetize/iframe');
         }
+
         $this->setGeneralVariablesView($view);
         $view->setXFrameOptions('allow');
-        $view->content = $outputDataTable;
+        $view->content = FrontController::getInstance()->fetchDispatch($controllerName, $actionName);
+
         return $view->render();
     }
 }

www/analytics/plugins/Widgetize/Menu.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Widgetize;
+
+use Piwik\Menu\MenuUser;
+use Piwik\Piwik;
+
+class Menu extends \Piwik\Plugin\Menu
+{
+    public function configureUserMenu(MenuUser $menu)
+    {
+        $tooltip   = Piwik::translate('Widgetize_TopLinkTooltip');
+        $urlParams = $this->urlForAction('index', array('segment' => false));
+
+        $menu->addPlatformItem('General_Widgets', $urlParams, 5, $tooltip);
+    }
+
+}

www/analytics/plugins/Widgetize/Widgetize.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -9,40 +9,28 @@
  */
 
 namespace Piwik\Plugins\Widgetize;
-use Piwik\Menu\MenuTop;
-use Piwik\Piwik;
 
-/**
- *
- */
 class Widgetize extends \Piwik\Plugin
 {
     /**
-     * @see Piwik\Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::registerEvents
      */
-    public function getListHooksRegistered()
+    public function registerEvents()
     {
         return array(
             'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
             'AssetManager.getStylesheetFiles'        => 'getStylesheetFiles',
-            'Menu.Top.addItems'                      => 'addTopMenu',
             'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
         );
     }
 
-    public function addTopMenu()
-    {
-        $tooltip = Piwik::translate('Widgetize_TopLinkTooltip');
-        $urlParams = array('module' => 'Widgetize', 'action' => 'index', 'segment' => false);
-
-        MenuTop::addEntry('General_Widgets', $urlParams, true, 5, $isHTML = false, $tooltip);
-    }
-
     public function getJsFiles(&$jsFiles)
     {
         $jsFiles[] = "libs/jquery/jquery.truncate.js";
-        $jsFiles[] = "libs/jquery/jquery.scrollTo.js";
-        $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js";
+        $jsFiles[] = "libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/jquery.icheck.min.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/morpheus.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js";
         $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js";
         $jsFiles[] = "plugins/Widgetize/javascripts/widgetize.js";

www/analytics/plugins/Widgetize/javascripts/widgetize.js

@@ -1,5 +1,5 @@
 /*!
- * Piwik - Web Analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@@ -64,7 +64,7 @@ function widgetize() {
                 '</span>' +
                 '</div>' +
                 '<div> <label for="embedThisWidgetDirectLink">&rsaquo; Direct Link</label>' +
-                '<span id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></span>'
+                '<span id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" rel="noreferrer"  target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></span>'
                 + '</div>'
         );
 

www/analytics/plugins/Widgetize/lang/ar.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "فتح في نافذة جديدة"
+    }
+}

www/analytics/plugins/Widgetize/lang/be.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Адкрыць у новым акне"
+    }
+}

www/analytics/plugins/Widgetize/lang/bg.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Отвори в нов прозорец",
+        "TopLinkTooltip": "Запазете Piwik докладите като джаджи и вградете таблото във вашето приложение като iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/bn.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "নতুন উইন্ডোতে খুলুন"
+    }
+}

www/analytics/plugins/Widgetize/lang/bs.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otvori u novom prozoru"
+    }
+}

www/analytics/plugins/Widgetize/lang/ca.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Obrir en una nova finestra",
+        "TopLinkTooltip": "Exporteu informes i ginys de Piwik i incrusteu el Tauler de Control a la vostra aplicació com un iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/cs.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Otevřít nové okno",
+        "PluginDescription": "Zobrazte jakékoliv hlášení z Piwiku na vašich stránkách pomocí jednoduchého vkládacího HTML tagu.",
+        "TopLinkTooltip": "Exportujte své Piwik hlášení jako widgety a použijte eje e vaší aplikaci jako iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/cy.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Agor mewn ffenestr newydd"
+    }
+}

www/analytics/plugins/Widgetize/lang/da.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Åben i et nyt vindue",
+        "PluginDescription": "Viser alle Piwik rapport på webstedet eller app med et simpel indlejrings HTML-tag.",
+        "TopLinkTooltip": "Eksporter Piwik rapporter som moduler og indlejre dit kontrolpanel i din applikation som en iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/de.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "In neuem Fenster öffnen",
+        "PluginDescription": "Zeigt sämtliche Piwik Berichte in Ihrer Website oder App mit einem einfachen Embed HTML tag an.",
+        "TopLinkTooltip": "Exportieren Sie Berichte als Widgets und binden Sie das Dashboard in Ihrer Applikation als iframe ein."
+    }
+}

www/analytics/plugins/Widgetize/lang/el.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Άνοιγμα σε νέο παράθυρο",
+        "PluginDescription": "Εμφάνιση οποιασδήποτε αναφοράς του Piwik στον ιστοτόπο ή την εφαρμογή σας με μια απλή σήμανση ενσωμάτωσης σε HTML.",
+        "TopLinkTooltip": "Εξαγωγή Αναφορών Piwik ως Μικροεφαρμογές και ενσωμάτωσή του Κεντρικού Πίνακα στην εφαρμογή σας ως πλαίσιο."
+    }
+}

www/analytics/plugins/Widgetize/lang/en.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Open in a new window",
+        "PluginDescription": "Display any Piwik report in your website or app with a simple Embed HTML tag.",
+        "TopLinkTooltip": "Export Piwik Reports as Widgets and embed the Dashboard in your app as an iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/es.json

@@ -0,0 +1,7 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Abrir en una nueva ventana",
+        "PluginDescription": "Mostrar un informe Piwik en su sitio de internet o aplicación con una simple etiqueta HTML incrustada.",
+        "TopLinkTooltip": "Exportar los informes de Piwik como una aplicación (widget) e incrustar el panel en su aplicación como un elemento iframe."
+    }
+}

www/analytics/plugins/Widgetize/lang/et.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Ava uues aknas"
+    }
+}

www/analytics/plugins/Widgetize/lang/fa.json

@@ -0,0 +1,5 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "باز کردن در یک پنجره جدید"
+    }
+}

www/analytics/plugins/Widgetize/lang/fi.json

@@ -0,0 +1,6 @@
+{
+    "Widgetize": {
+        "OpenInNewWindow": "Avaa uudessa ikkunassa",
+        "TopLinkTooltip": "Vie Piwikin raportteja vimpaimiksi ja lisää työpöytä ohjelmaan iframena."
+    }
+}