update Piwik to version 2.16 (fixes #91)

2016-04-10 18:55:57 +02:00 · 2016-04-10 18:55:57 +02:00 · 47263617c5
commit 47263617c5
parent 9abe039dc8
59 changed files with 418860 additions and 226988 deletions
--- a/www/analytics/plugins/VisitsSummary/API.php
+++ b/www/analytics/plugins/VisitsSummary/API.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
@ -9,8 +9,9 @@
 namespace Piwik\Plugins\VisitsSummary;

 use Piwik\Archive;
-use Piwik\MetricsFormatter;
+use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
+use Piwik\Plugin\Report;
 use Piwik\SettingsPiwik;

 /**
@ -26,51 +27,18 @@ class API extends \Piwik\Plugin\API
        Piwik::checkUserHasViewAccess($idSite);
        $archive = Archive::build($idSite, $period, $date, $segment);

-        // array values are comma separated
-        $columns = Piwik::getArrayFromApiParameter($columns);
-        $tempColumns = array();
+        $requestedColumns = Piwik::getArrayFromApiParameter($columns);

-        $bounceRateRequested = $actionsPerVisitRequested = $averageVisitDurationRequested = false;
-        if (!empty($columns)) {
-            // make sure base metrics are there for processed metrics
-            if (false !== ($bounceRateRequested = array_search('bounce_rate', $columns))) {
-                if (!in_array('nb_visits', $columns)) $tempColumns[] = 'nb_visits';
-                if (!in_array('bounce_count', $columns)) $tempColumns[] = 'bounce_count';
-                unset($columns[$bounceRateRequested]);
-            }
-            if (false !== ($actionsPerVisitRequested = array_search('nb_actions_per_visit', $columns))) {
-                if (!in_array('nb_visits', $columns)) $tempColumns[] = 'nb_visits';
-                if (!in_array('nb_actions', $columns)) $tempColumns[] = 'nb_actions';
-                unset($columns[$actionsPerVisitRequested]);
-            }
-            if (false !== ($averageVisitDurationRequested = array_search('avg_time_on_site', $columns))) {
-                if (!in_array('nb_visits', $columns)) $tempColumns[] = 'nb_visits';
-                if (!in_array('sum_visit_length', $columns)) $tempColumns[] = 'sum_visit_length';
-                unset($columns[$averageVisitDurationRequested]);
-            }
-            $tempColumns = array_unique($tempColumns);
-            rsort($tempColumns);
-            $columns = array_merge($columns, $tempColumns);
-        } else {
-            $bounceRateRequested = $actionsPerVisitRequested = $averageVisitDurationRequested = true;
-            $columns = $this->getCoreColumns($period);
-        }
+        $report = Report::factory("VisitsSummary", "get");
+        $columns = $report->getMetricsRequiredForReport($this->getCoreColumns($period), $requestedColumns);

        $dataTable = $archive->getDataTableFromNumeric($columns);

-        // Process ratio metrics from base metrics, when requested
-        if ($bounceRateRequested !== false) {
-            $dataTable->filter('ColumnCallbackAddColumnPercentage', array('bounce_rate', 'bounce_count', 'nb_visits', 0));
-        }
-        if ($actionsPerVisitRequested !== false) {
-            $dataTable->filter('ColumnCallbackAddColumnQuotient', array('nb_actions_per_visit', 'nb_actions', 'nb_visits', 1));
-        }
-        if ($averageVisitDurationRequested !== false) {
-            $dataTable->filter('ColumnCallbackAddColumnQuotient', array('avg_time_on_site', 'sum_visit_length', 'nb_visits', 0));
+        if (!empty($requestedColumns)) {
+            $columnsToShow = $requestedColumns ?: $report->getAllMetrics();
+            $dataTable->queueFilter('ColumnDelete', array($columnsToRemove = array(), $columnsToShow));
        }

-        // remove temp metrics that were used to compute processed metrics
-        $dataTable->deleteColumns($tempColumns);
        return $dataTable;
    }

@ -95,7 +63,7 @@ class API extends \Piwik\Plugin\API
            'max_actions'
        );
        if (SettingsPiwik::isUniqueVisitorsEnabled($period)) {
-            $columns = array_merge(array('nb_uniq_visitors'), $columns);
+            $columns = array_merge(array('nb_uniq_visitors', 'nb_users'), $columns);
        }
        $columns = array_values($columns);
        return $columns;
@ -116,7 +84,16 @@ class API extends \Piwik\Plugin\API

    public function getUniqueVisitors($idSite, $period, $date, $segment = false)
    {
-        return $this->getNumeric($idSite, $period, $date, $segment, 'nb_uniq_visitors');
+        $metric = 'nb_uniq_visitors';
+        $this->checkUniqueIsEnabledOrFail($period, $metric);
+        return $this->getNumeric($idSite, $period, $date, $segment, $metric);
+    }
+
+    public function getUsers($idSite, $period, $date, $segment = false)
+    {
+        $metric = 'nb_users';
+        $this->checkUniqueIsEnabledOrFail($period, $metric);
+        return $this->getNumeric($idSite, $period, $date, $segment, $metric);
    }

    public function getActions($idSite, $period, $date, $segment = false)
@ -146,13 +123,30 @@ class API extends \Piwik\Plugin\API

    public function getSumVisitsLengthPretty($idSite, $period, $date, $segment = false)
    {
+        $formatter = new Formatter();
+
        $table = $this->getSumVisitsLength($idSite, $period, $date, $segment);
        if (is_object($table)) {
            $table->filter('ColumnCallbackReplace',
-                array('sum_visit_length', '\Piwik\MetricsFormatter::getPrettyTimeFromSeconds'));
+                array('sum_visit_length', array($formatter, 'getPrettyTimeFromSeconds'), array(true)));
        } else {
-            $table = MetricsFormatter::getPrettyTimeFromSeconds($table);
+            $table = $formatter->getPrettyTimeFromSeconds($table, true);
        }
        return $table;
    }
+
+    /**
+     * @param $period
+     * @param $metric
+     * @throws \Exception
+     */
+    private function checkUniqueIsEnabledOrFail($period, $metric)
+    {
+        if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) {
+            throw new \Exception(
+                "The metric " . $metric . " is not enabled for the requested period. " .
+                "Please see this FAQ: http://piwik.org/faq/how-to/faq_113/"
+            );
+        }
+    }
 }
--- a/www/analytics/plugins/VisitsSummary/Controller.php
+++ b/www/analytics/plugins/VisitsSummary/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
@ -10,11 +10,11 @@ namespace Piwik\Plugins\VisitsSummary;

 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
-use Piwik\Plugins\Actions\API as APIActions;
 use Piwik\Site;
+use Piwik\Translation\Translator;
 use Piwik\View;

 /**
@ -22,15 +22,35 @@ use Piwik\View;
 */
 class Controller extends \Piwik\Plugin\Controller
 {
+    /**
+     * @var Translator
+     */
+    private $translator;
+
+    public function __construct(Translator $translator)
+    {
+        $this->translator = $translator;
+
+        parent::__construct();
+    }
+
    public function index()
    {
        $view = new View('@VisitsSummary/index');
        $this->setPeriodVariablesView($view);
-        $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array('nb_visits'));
+        $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array(), array('nb_visits'), 'getIndexGraph');
        $this->setSparklinesAndNumbers($view);
        return $view->render();
    }

+    // sparkline.js:81 dataTable.trigger('reload', …); does not remove the old headline,
+    // so when updating this graph (such as when selecting a different metric)
+    // ONLY the graph should be returned
+    public function getIndexGraph()
+    {
+        return $this->getEvolutionGraph(array(), array(), __FUNCTION__);
+    }
+
    public function getSparklines()
    {
        $view = new View('@VisitsSummary/getSparklines');
@ -39,32 +59,38 @@ class Controller extends \Piwik\Plugin\Controller
        return $view->render();
    }

-    public function getEvolutionGraph(array $columns = array())
+    public function getEvolutionGraph(array $columns = array(), array $defaultColumns = array(), $callingAction = __FUNCTION__)
    {
        if (empty($columns)) {
-            $columns = Common::getRequestVar('columns');
-            $columns = Piwik::getArrayFromApiParameter($columns);
+            $columns = Common::getRequestVar('columns', false);
+            if (false !== $columns) {
+                $columns = Piwik::getArrayFromApiParameter($columns);
+            }
        }

-        $documentation = Piwik::translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
-            . Piwik::translate('General_BrokenDownReportDocumentation') . '<br /><br />'
+        $documentation = $this->translator->translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />'
+            . $this->translator->translate('General_BrokenDownReportDocumentation') . '<br /><br />'

-            . '<b>' . Piwik::translate('General_ColumnNbVisits') . ':</b> '
-            . Piwik::translate('General_ColumnNbVisitsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbVisits') . ':</b> '
+            . $this->translator->translate('General_ColumnNbVisitsDocumentation') . '<br />'

-            . '<b>' . Piwik::translate('General_ColumnNbUniqVisitors') . ':</b> '
-            . Piwik::translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbUniqVisitors') . ':</b> '
+            . $this->translator->translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />'

-            . '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> '
-            . Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />'
+            . '<b>' . $this->translator->translate('General_ColumnNbActions') . ':</b> '
+            . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />'

-            . '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> '
-            . Piwik::translate('General_ColumnActionsPerVisitDocumentation');
+            . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> '
+            . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer"  target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />'
+
+            . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> '
+            . $this->translator->translate('General_ColumnActionsPerVisitDocumentation');

        $selectableColumns = array(
            // columns from VisitsSummary.get
            'nb_visits',
            'nb_uniq_visitors',
+            'nb_users',
            'avg_time_on_site',
            'bounce_rate',
            'nb_actions_per_visit',
@ -87,26 +113,31 @@ class Controller extends \Piwik\Plugin\Controller
            $selectableColumns[] = 'nb_searches';
            $selectableColumns[] = 'nb_keywords';
        }
-
-        $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns,
+        // $callingAction may be specified to distinguish between
+        // "VisitsSummary_WidgetLastVisits" and "VisitsSummary_WidgetOverviewGraph"
+        $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, $callingAction, $columns,
            $selectableColumns, $documentation);

+        if (empty($view->config->columns_to_display) && !empty($defaultColumns)) {
+            $view->config->columns_to_display = $defaultColumns;
+        }
+
        return $this->renderView($view);
    }

-    static public function getVisitsSummary()
+    public static function getVisitsSummary()
    {
-        $requestString = "method=VisitsSummary.get" .
-            "&format=original" .
+        $result = Request::processRequest("VisitsSummary.get", array(
            // we disable filters for example "search for pattern", in the case this method is called
            // by a method that already calls the API with some generic filters applied
-            "&disable_generic_filters=1";
-        $request = new Request($requestString);
-        $result = $request->process();
+            'disable_generic_filters' => 1,
+            'columns' => false
+        ));
+
        return empty($result) ? new DataTable() : $result;
    }

-    static public function getVisits()
+    public static function getVisits()
    {
        $requestString = "method=VisitsSummary.getVisits" .
            "&format=original" .
@ -118,6 +149,7 @@ class Controller extends \Piwik\Plugin\Controller
    protected function setSparklinesAndNumbers($view)
    {
        $view->urlSparklineNbVisits = $this->getUrlSparkline('getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('nb_visits', 'nb_uniq_visitors') : array('nb_visits')));
+        $view->urlSparklineNbUsers = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_users')));
        $view->urlSparklineNbPageviews = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews')));
        $view->urlSparklineNbDownloads = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads')));
        $view->urlSparklineNbOutlinks = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks')));
@ -136,22 +168,26 @@ class Controller extends \Piwik\Plugin\Controller

        $dataTableVisit = self::getVisitsSummary();
        $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Row() : $dataTableVisit->getFirstRow();
-
-
        $view->nbUniqVisitors = (int)$dataRow->getColumn('nb_uniq_visitors');
+        $view->nbUsers = (int)$dataRow->getColumn('nb_users');
        $nbVisits = (int)$dataRow->getColumn('nb_visits');
        $view->nbVisits = $nbVisits;

        $view->averageVisitDuration = $dataRow->getColumn('avg_time_on_site');
-        $nbBouncedVisits = $dataRow->getColumn('bounce_count');
-        $view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits);
+        $view->bounceRate = $dataRow->getColumn('bounce_rate');
        $view->maxActions = (int)$dataRow->getColumn('max_actions');
        $view->nbActionsPerVisit = $dataRow->getColumn('nb_actions_per_visit');

-        if(Common::isActionsPluginEnabled()) {
+        if (Common::isActionsPluginEnabled()) {
            $view->showActionsPluginReports = true;
-            $dataTableActions = APIActions::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'),
-                \Piwik\API\Request::getRawSegmentFromRequest());
+
+            $dataTableActions = Request::processRequest("Actions.get", array(
+                'idSite' => $idSite,
+                'period' => Common::getRequestVar('period'),
+                'date' => Common::getRequestVar('date'),
+                'segment' => Request::getRawSegmentFromRequest()
+            ), $defaultParams = array());
+
            $dataActionsRow =
                $dataTableActions->getRowsCount() == 0 ? new Row() : $dataTableActions->getFirstRow();

@ -163,7 +199,6 @@ class Controller extends \Piwik\Plugin\Controller
            $view->nbUniqueOutlinks = (int)$dataActionsRow->getColumn('nb_uniq_outlinks');
            $view->averageGenerationTime = $dataActionsRow->getColumn('avg_time_generation');

-
            if ($displaySiteSearch) {
                $view->nbSearches = (int)$dataActionsRow->getColumn('nb_searches');
                $view->nbKeywords = (int)$dataActionsRow->getColumn('nb_keywords');
--- a/www/analytics/plugins/VisitsSummary/Menu.php
+++ b/www/analytics/plugins/VisitsSummary/Menu.php
@ -0,0 +1,20 @@
+<?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\VisitsSummary;
+
+use Piwik\Menu\MenuReporting;
+
+class Menu extends \Piwik\Plugin\Menu
+{
+    public function configureReportingMenu(MenuReporting $menu)
+    {
+        $menu->addVisitorsItem('', array(), 10);
+        $menu->addVisitorsItem('General_Overview', array('module' => 'VisitsSummary', 'action' => 'index'), 1);
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/Reports/Get.php
+++ b/www/analytics/plugins/VisitsSummary/Reports/Get.php
@ -0,0 +1,82 @@
+<?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\VisitsSummary\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
+use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
+
+class Get extends \Piwik\Plugin\Report
+{
+    private $usersColumn = 'nb_users';
+
+    protected function init()
+    {
+        parent::init();
+        $this->category      = 'VisitsSummary_VisitsSummary';
+        $this->name          = Piwik::translate('VisitsSummary_VisitsSummary');
+        $this->documentation = ''; // TODO
+        $this->processedMetrics = array(
+            new BounceRate(),
+            new ActionsPerVisit(),
+            new AverageTimeOnSite()
+        );
+        $this->metrics       = array(
+            'nb_uniq_visitors',
+            'nb_visits',
+            $this->usersColumn,
+            'nb_actions',
+            'max_actions'
+        );
+        // Used to process metrics, not displayed/used directly
+//								'sum_visit_length',
+//								'nb_visits_converted',
+        $this->order = 1;
+    }
+
+    public function getMetrics()
+    {
+        $metrics = parent::getMetrics();
+
+        $metrics['max_actions'] = Piwik::translate('General_ColumnMaxActions');
+
+        return $metrics;
+    }
+
+    public function getProcessedMetrics()
+    {
+        $metrics = parent::getProcessedMetrics();
+
+        $metrics['avg_time_on_site'] = Piwik::translate('General_VisitDuration');
+
+        return $metrics;
+    }
+
+    public function removeUsersFromProcessedReport(&$response)
+    {
+        if (!empty($response['metadata']['metrics'][$this->usersColumn])) {
+            unset($response['metadata']['metrics'][$this->usersColumn]);
+        }
+
+        if (!empty($response['metadata']['metricsDocumentation'][$this->usersColumn])) {
+            unset($response['metadata']['metricsDocumentation'][$this->usersColumn]);
+        }
+
+        if (!empty($response['columns'][$this->usersColumn])) {
+            unset($response['columns'][$this->usersColumn]);
+        }
+
+        if (!empty($response['reportData'])) {
+            $dataTable = $response['reportData'];
+            $dataTable->deleteColumn($this->usersColumn, true);
+        }
+    }
+
+}
--- a/www/analytics/plugins/VisitsSummary/VisitsSummary.php
+++ b/www/analytics/plugins/VisitsSummary/VisitsSummary.php
@ -1,16 +1,15 @@
 <?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
 *
 */
 namespace Piwik\Plugins\VisitsSummary;
-
-use Piwik\Menu\MenuMain;
-use Piwik\Piwik;
-use Piwik\WidgetsList;
+use Piwik\DataTable;
+use Piwik\Plugins\CoreHome\Columns\UserId;
+use Piwik\Plugins\VisitsSummary\Reports\Get;

 /**
 * Note: This plugin does not hook on Daily and Period Archiving like other Plugins because it reports the
@ -22,40 +21,48 @@ use Piwik\WidgetsList;
 class VisitsSummary extends \Piwik\Plugin
 {
    /**
-     * @see Piwik\Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::registerEvents
     */
-    public function getListHooksRegistered()
+    public function registerEvents()
    {
        return array(
-            'API.getReportMetadata'   => 'getReportMetadata',
-            'WidgetsList.addWidgets'  => 'addWidgets',
-            'Menu.Reporting.addItems' => 'addMenu',
            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+            'API.API.getProcessedReport.end' => 'enrichProcessedReportIfVisitsSummaryGet',
        );
    }

-    public function getReportMetadata(&$reports)
+    private function isRequestingVisitsSummaryGet($module, $method)
    {
-        $reports[] = array(
-            'category'         => Piwik::translate('VisitsSummary_VisitsSummary'),
-            'name'             => Piwik::translate('VisitsSummary_VisitsSummary'),
-            'module'           => 'VisitsSummary',
-            'action'           => 'get',
-            'metrics'          => array(
-                'nb_uniq_visitors',
-                'nb_visits',
-                'nb_actions',
-                'nb_actions_per_visit',
-                'bounce_rate',
-                'avg_time_on_site' => Piwik::translate('General_VisitDuration'),
-                'max_actions'      => Piwik::translate('General_ColumnMaxActions'),
-// Used to process metrics, not displayed/used directly
-//								'sum_visit_length',
-//								'nb_visits_converted',
-            ),
-            'processedMetrics' => false,
-            'order'            => 1
-        );
+        return ($module === 'VisitsSummary' && $method === 'get');
+    }
+
+    public function enrichProcessedReportIfVisitsSummaryGet(&$response, $infos)
+    {
+        if (empty($infos['parameters'][4]) || empty($response['reportData'])) {
+            return;
+        }
+
+        $params  = $infos['parameters'];
+        $idSites = array($params[0]);
+        $period  = $params[1];
+        $date    = $params[2];
+        $module  = $params[3];
+        $method  = $params[4];
+
+        if (!$this->isRequestingVisitsSummaryGet($module, $method)) {
+            return;
+        }
+
+        $userId = new UserId();
+
+        /** @var DataTable|DataTable\Map $dataTable */
+        $dataTable = $response['reportData'];
+
+        if (!$userId->hasDataTableUsers($dataTable) &&
+            !$userId->isUsedInAtLeastOneSite($idSites, $period, $date)) {
+            $report = new Get();
+            $report->removeUsersFromProcessedReport($response);
+        }
    }

    public function getStylesheetFiles(&$stylesheets)
@ -63,18 +70,5 @@ class VisitsSummary extends \Piwik\Plugin
        $stylesheets[] = "plugins/VisitsSummary/stylesheets/datatable.less";
    }

-    function addWidgets()
-    {
-        WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits')));
-        WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines');
-        WidgetsList::add('VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index');
-    }
-
-    function addMenu()
-    {
-        MenuMain::getInstance()->add('General_Visitors', '', array('module' => 'VisitsSummary', 'action' => 'index'), true, 10);
-        MenuMain::getInstance()->add('General_Visitors', 'General_Overview', array('module' => 'VisitsSummary', 'action' => 'index'), true, 1);
-    }
 }

-
--- a/www/analytics/plugins/VisitsSummary/Widgets.php
+++ b/www/analytics/plugins/VisitsSummary/Widgets.php
@ -0,0 +1,22 @@
+<?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\VisitsSummary;
+
+class Widgets extends \Piwik\Plugin\Widgets
+{
+    protected $category = 'VisitsSummary_VisitsSummary';
+
+    public function init()
+    {
+        $this->addWidget('VisitsSummary_WidgetLastVisits', 'getEvolutionGraph', array('columns' => array('nb_visits')));
+        $this->addWidget('VisitsSummary_WidgetVisits', 'getSparklines');
+        $this->addWidget('VisitsSummary_WidgetOverviewGraph', 'index');
+    }
+
+}
--- a/www/analytics/plugins/VisitsSummary/lang/am.json
+++ b/www/analytics/plugins/VisitsSummary/lang/am.json
@ -0,0 +1,12 @@
+{
+    "VisitsSummary": {
+        "GenerateQueries": "%s ጥያቄዎች ተሰርተዋል",
+        "GenerateTime": "%s ሰከንዶች ገፁን ለማመንጨት",
+        "MaxNbActions": "%s በአንድ ጉብኝት የተወሰዱ ከፍተኛ ርምጃዎች",
+        "NbUniqueVisitors": "%s የተለዩ ጎብኚዎች",
+        "NbVisitsBounced": "%s የተመለሱ ጉብኝቶች (ከአንድ ገፅ በኋላ ገፁን የተዉ)",
+        "WidgetLastVisits": "የመጨረሻው ጉብኝቶች ግራፍ",
+        "WidgetOverviewGraph": "አጠቃላይ እይታ ከግራፍ ጋር",
+        "WidgetVisits": "የጉብኝቶች አጠቃላይ እይታ"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/ar.json
+++ b/www/analytics/plugins/VisitsSummary/lang/ar.json
@ -0,0 +1,16 @@
+{
+    "VisitsSummary": {
+        "AverageVisitDuration": "%s متوسط زمن الزيارة",
+        "GenerateQueries": "%s استعلام تم تنفيذهم",
+        "GenerateTime": "%s ثانية لإنشاء هذه الصفحة",
+        "MaxNbActions": "%s أقصى عدد للسلوكيات في زيارة واحدة",
+        "NbActionsDescription": "%s سلوك (عدد مشاهدات الصفحة، التحميلات، والروابط الصادرة)",
+        "NbActionsPerVisit": "%s سلوك لكل زيارة",
+        "NbUniqueVisitors": "%s زيارة فريدة",
+        "NbVisitsBounced": "%s زيارات مرتدة (غادر الموقع بعد مشاهدة أول صفحة)",
+        "VisitsSummary": "ملخص الزيارات",
+        "WidgetLastVisits": "الرسم البياني لآخر الزيارات",
+        "WidgetOverviewGraph": "نظرة عامة مع الرسم البياني",
+        "WidgetVisits": "نظرة عامة على الزيارات"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/be.json
+++ b/www/analytics/plugins/VisitsSummary/lang/be.json
@ -0,0 +1,17 @@
+{
+    "VisitsSummary": {
+        "AverageVisitDuration": "%s сярэдняя працягласць наведвання",
+        "GenerateQueries": "%s запытаў выканана",
+        "GenerateTime": "Старонка згенеравана за %s секунд",
+        "MaxNbActions": "%s макс. дзеянняў за адно наведванне",
+        "NbActionsDescription": "%s дзеянні (прагляды старонак, запампоўка і знешнія спасылкі)",
+        "NbActionsPerVisit": "%s дзеянняў за наведванне",
+        "NbUniqueVisitors": "%s унікальных наведвальнікаў",
+        "NbVisitsBounced": "%s наведвальнікаў сышло пасля наведвання адной старонкі",
+        "VisitsSummary": "Наведванні сумарна",
+        "VisitsSummaryDocumentation": "Гэта агляд зменаў наведванняў.",
+        "WidgetLastVisits": "Графік апошніх наведванняў",
+        "WidgetOverviewGraph": "Агляд па ўсіх графіках",
+        "WidgetVisits": "Агляд наведванняў"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/bg.json
+++ b/www/analytics/plugins/VisitsSummary/lang/bg.json
@ -0,0 +1,26 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s средно времетраене за обработка на заявката",
+        "AverageVisitDuration": "%s средно времетраене на посещението",
+        "GenerateQueries": "%s заявки са изпълнени",
+        "GenerateTime": "%s секунди за генериране на страницата",
+        "MaxNbActions": "%s макс. действия при едно посещение",
+        "NbActionsDescription": "%s действия (показвания, изтегляния и outlinks)",
+        "NbActionsPerVisit": "%s действия на посещение",
+        "NbDownloadsDescription": "%s изтегляния",
+        "NbKeywordsDescription": "%s уникални ключови думи",
+        "NbOutlinksDescription": "%s външни връзки",
+        "NbPageviewsDescription": "%s преглеждания на страница",
+        "NbSearchesDescription": "%s общо търсения в вашият сайт",
+        "NbUniqueDownloadsDescription": "%s уникални изтегляния",
+        "NbUniqueOutlinksDescription": "%s уникални външни връзки",
+        "NbUniquePageviewsDescription": "%s уникални преглеждания на страница",
+        "NbUniqueVisitors": "%s уникални посетителя",
+        "NbVisitsBounced": "%s посещения са отскочили (напуснали още след първата разгледана страница)",
+        "VisitsSummary": "Резюме на посещенията",
+        "VisitsSummaryDocumentation": "Това е преглед на еволюцията на посещенията.",
+        "WidgetLastVisits": "Последни посетители",
+        "WidgetOverviewGraph": "Резюме с графика",
+        "WidgetVisits": "Резюме на посещенията"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/ca.json
+++ b/www/analytics/plugins/VisitsSummary/lang/ca.json
@ -0,0 +1,25 @@
+{
+    "VisitsSummary": {
+        "AverageVisitDuration": "%s duració mitja de la visita",
+        "GenerateQueries": "S'ha executat un total de %s consultes",
+        "GenerateTime": "S'han trigat %s segons en generar la pàgina",
+        "MaxNbActions": "Hi ha %s accions màximes en una visita",
+        "NbActionsDescription": "%s accions",
+        "NbActionsPerVisit": "%s accions (visualitzacions de pàgina, descàrregues i enllaços exteriors) per visita",
+        "NbDownloadsDescription": "%s descàrregues",
+        "NbKeywordsDescription": "%s paraules clau úniques",
+        "NbOutlinksDescription": "%s enllaços externs",
+        "NbPageviewsDescription": "%s visualitzacions de pàgina",
+        "NbSearchesDescription": "%s cerques totals al lloc web",
+        "NbUniqueDownloadsDescription": "%s descàrregues úniques",
+        "NbUniqueOutlinksDescription": "%s enllaços externs únics",
+        "NbUniquePageviewsDescription": "%s visualitzacions de pàgina úniques",
+        "NbUniqueVisitors": "%s visitants únics",
+        "NbVisitsBounced": "%s visites han rebotat (abandonat el lloc després de veure una pàgina)",
+        "VisitsSummary": "Resum de les visites",
+        "VisitsSummaryDocumentation": "Aquesta és una visió general de l'evolució visita.",
+        "WidgetLastVisits": "Gràfic de les darreres visites",
+        "WidgetOverviewGraph": "Resum amb gràfic",
+        "WidgetVisits": "Resum de les visites"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/cs.json
+++ b/www/analytics/plugins/VisitsSummary/lang/cs.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s průměrný čas generování",
+        "AverageVisitDuration": "%s průměrná doba návštěvy",
+        "GenerateQueries": "%s provedeno dotazů",
+        "GenerateTime": "%s sekund k vygenerování stránky",
+        "MaxNbActions": "%s maximální počet akcí na návštěvu",
+        "NbActionsDescription": "%s akcí (zobrazení stránek, stažení a odchodů)",
+        "NbActionsPerVisit": "%s akcí (zobrazení stránek, stažení, odkazů a vyhledávání) na návštěvu",
+        "NbDownloadsDescription": "%s stažení",
+        "NbKeywordsDescription": "%s unikátní klíčová slova",
+        "NbOutlinksDescription": "%s externích odkazů",
+        "NbPageviewsDescription": "%s zobrazení",
+        "NbSearchesDescription": "Celkem %s vyhledávání na vašich stránkách",
+        "NbUniqueDownloadsDescription": "%s unikátních stažení",
+        "NbUniqueOutlinksDescription": "%s unikátních externích odkazů",
+        "NbUniquePageviewsDescription": "%s unikátních zobrazení",
+        "NbUniqueVisitors": "%s unikátních návštěvníků",
+        "NbVisitsBounced": "%s návštěvníků odešlo (opustilo web po jedné stránce)",
+        "PluginDescription": "Hlásí základní analytická měření: počet návštěv a unikátních návštěvníků, počet akcí, frekvenci odrazu atd.",
+        "VisitsSummary": "Shrnutí návštěv",
+        "VisitsSummaryDocumentation": "Toto je přehled vývoje návštěv.",
+        "WidgetLastVisits": "Graf posledních návštěv",
+        "WidgetOverviewGraph": "Přehled s grafem",
+        "WidgetVisits": "Přehled návštěv"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/da.json
+++ b/www/analytics/plugins/VisitsSummary/lang/da.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s gennemsnitlige genereringstid",
+        "AverageVisitDuration": "%s gns. besøgsvarighed",
+        "GenerateQueries": "%s forespørgsler kørt",
+        "GenerateTime": "Siden genereret på %s sek.",
+        "MaxNbActions": "%s maks. handlinger i ét enkelt besøg",
+        "NbActionsDescription": "%s handlinger (sidevisninger, filhentninger og udgående links)",
+        "NbActionsPerVisit": "%s handlinger pr. besøg",
+        "NbDownloadsDescription": "%s fil-hentninger",
+        "NbKeywordsDescription": "%s unikke søgeord",
+        "NbOutlinksDescription": "%s udgående links",
+        "NbPageviewsDescription": "%s sidevisninger",
+        "NbSearchesDescription": "%s søgninger på hjemmesiden",
+        "NbUniqueDownloadsDescription": "%s unikke fil-hentninger",
+        "NbUniqueOutlinksDescription": "%s unikke udgående links",
+        "NbUniquePageviewsDescription": "%s unikke sidevisninger",
+        "NbUniqueVisitors": "%s unikke besøgende",
+        "NbVisitsBounced": "%s har forladt hjemmesiden efter én sidevisning",
+        "PluginDescription": "Rapporter generelle analyse målinger: besøg, unikke besøgende, antal handlinger, afvisningsrate, osv",
+        "VisitsSummary": "Besøg resumé",
+        "VisitsSummaryDocumentation": "Oversigt over besøgsudviklingen.",
+        "WidgetLastVisits": "Seneste besøg",
+        "WidgetOverviewGraph": "Oversigt med diagrammer",
+        "WidgetVisits": "Besøgsoversigt"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/de.json
+++ b/www/analytics/plugins/VisitsSummary/lang/de.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s durchschnittliche Generierungszeit",
+        "AverageVisitDuration": "%s durchschnittliche Aufenthaltsdauer",
+        "GenerateQueries": "%s Abfragen durchgeführt",
+        "GenerateTime": "%s Sekunden, um die Seite zu generieren",
+        "MaxNbActions": "%s max. Aktionen pro Besuch",
+        "NbActionsDescription": "%s Aktionen",
+        "NbActionsPerVisit": "%s Aktionen (Seitenansichten, Downloads, ausgehende Verweise und interne Suchen) pro Besuch",
+        "NbDownloadsDescription": "%s Downloads",
+        "NbKeywordsDescription": "%s eindeutige Suchbegriffe",
+        "NbOutlinksDescription": "%s ausgehende Verweise",
+        "NbPageviewsDescription": "%s Seitenansichten",
+        "NbSearchesDescription": "%s interne Suchen",
+        "NbUniqueDownloadsDescription": "%s eindeutige Downloads",
+        "NbUniqueOutlinksDescription": "%s eindeutige ausgehende Verweise",
+        "NbUniquePageviewsDescription": "%s eindeutige Seitenaufrufe",
+        "NbUniqueVisitors": "%s eindeutige Besucher",
+        "NbVisitsBounced": "%s Besucher sind abgesprungen (haben die Website nach einer Seite verlassen)",
+        "PluginDescription": "Berichte mit generellen analytischen Metriken: Besuche, eindeutige Besucher, Anzahl Aktionen, Absprungsrate, usw.",
+        "VisitsSummary": "Besucherüberblick",
+        "VisitsSummaryDocumentation": "Dies ist eine Übersicht über die Entwicklung der Besuche.",
+        "WidgetLastVisits": "Graph der letzten Besuche",
+        "WidgetOverviewGraph": "Übersicht mit Graph",
+        "WidgetVisits": "Besucherübersicht"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/el.json
+++ b/www/analytics/plugins/VisitsSummary/lang/el.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s μέσος χρόνος δημιουργίας",
+        "AverageVisitDuration": "%s μέση διάρκεια επισκέψεων",
+        "GenerateQueries": "%s ερωτήματα εκτελέστηκαν",
+        "GenerateTime": "%s δευτερόλεπτα για τη δημιουργία της σελίδας",
+        "MaxNbActions": "%s είναι ο μέγιστος αριθμός δραστηριοτήτων σε μία επίσκεψη",
+        "NbActionsDescription": "%s δραστηριότητες",
+        "NbActionsPerVisit": "%s δραστηριότητες ανά επίσκεψη",
+        "NbDownloadsDescription": "%s λήψεις",
+        "NbKeywordsDescription": "%s μοναδικές λέξεις κλειδιά",
+        "NbOutlinksDescription": "%s σύνδεσμοι προς εξωτερικό",
+        "NbPageviewsDescription": "%s προβολές σελίδων",
+        "NbSearchesDescription": "%s συνολικές αναζητήσεις στον ιστοτόπο σας",
+        "NbUniqueDownloadsDescription": "%s μοναδικές λήψεις",
+        "NbUniqueOutlinksDescription": "%s μοναδικοί σύνδεσμοι προς εξωτερικό",
+        "NbUniquePageviewsDescription": "%s μοναδικές προβολές σελίδων",
+        "NbUniqueVisitors": "%s μοναδικοί επισκέπτες",
+        "NbVisitsBounced": "%s των επισκεπτών απομακρύνθηκαν (έφυγαν από την πρώτη σελίδα)",
+        "PluginDescription": "Αναφέρει γενικές μετρικές αναλυτικών: επισκέψεις, μοναδικοί επισκέπτες, αριθμός ενεργειών, ρυθμός αναπήδησης, κτλ.",
+        "VisitsSummary": "Περίληψη επισκέψεων",
+        "VisitsSummaryDocumentation": "Αυτή είναι μια επισκόπηση της εξέλιξης των επισκέψεων.",
+        "WidgetLastVisits": "Διάγραμμα τελευταίων επισκέψεων",
+        "WidgetOverviewGraph": "Επισκόπηση με διάγραμμα",
+        "WidgetVisits": "Επισκόπηση επισκέψεων"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/en.json
+++ b/www/analytics/plugins/VisitsSummary/lang/en.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s average generation time",
+        "AverageVisitDuration": "%s average visit duration",
+        "GenerateQueries": "%s queries executed",
+        "GenerateTime": "%s seconds to generate the page",
+        "MaxNbActions": "%s max actions in one visit",
+        "NbActionsDescription": "%s actions",
+        "NbActionsPerVisit": "%s actions (page views, downloads, outlinks and internal site searches) per visit",
+        "NbDownloadsDescription": "%s downloads",
+        "NbKeywordsDescription": "%s unique keywords",
+        "NbOutlinksDescription": "%s outlinks",
+        "NbPageviewsDescription": "%s pageviews",
+        "NbSearchesDescription": "%s total searches on your website",
+        "NbUniqueDownloadsDescription": "%s unique downloads",
+        "NbUniqueOutlinksDescription": "%s unique outlinks",
+        "NbUniquePageviewsDescription": "%s unique pageviews",
+        "NbUniqueVisitors": "%s unique visitors",
+        "NbVisitsBounced": "%s visits have bounced (left the website after one page)",
+        "PluginDescription": "Reports general analytics metrics: visits, unique visitors, number of actions, bounce rate, etc.",
+        "VisitsSummary": "Visits Summary",
+        "VisitsSummaryDocumentation": "This is an overview of the visit evolution.",
+        "WidgetLastVisits": "Visits Over Time",
+        "WidgetOverviewGraph": "Visits Overview (with graph)",
+        "WidgetVisits": "Visits Overview"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/es.json
+++ b/www/analytics/plugins/VisitsSummary/lang/es.json
@ -0,0 +1,27 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s tiempo promedio de generación",
+        "AverageVisitDuration": "%s duración promedio de la visita",
+        "GenerateQueries": "%s consultas ejecutadas",
+        "GenerateTime": "%s segundos para generar la página",
+        "MaxNbActions": "%s acciones máximas en una visita",
+        "NbActionsDescription": "%s acciones",
+        "NbActionsPerVisit": "%s acciones del visitante (páginas vistas, descargas, enlaces a otras páginas de otros sitios y búsquedas internas del sitio)",
+        "NbDownloadsDescription": "%s descargas",
+        "NbKeywordsDescription": "%s palabras claves únicas",
+        "NbOutlinksDescription": "%s enlaces salientes",
+        "NbPageviewsDescription": "%s vista de páginas",
+        "NbSearchesDescription": "%s búsquedas totales en su sitio de internet",
+        "NbUniqueDownloadsDescription": "%s descargas únicas",
+        "NbUniqueOutlinksDescription": "%s enlaces salientes únicos",
+        "NbUniquePageviewsDescription": "%s vista de páginas únicas",
+        "NbUniqueVisitors": "%s visitantes únicos",
+        "NbVisitsBounced": "%s de visitas que han vuelto (abandonaron el sitio después de una página)",
+        "PluginDescription": "Informes generales de análisis de la métricas: visitas, visitantes únicos, número de acciones, tasa de rebote, etc.",
+        "VisitsSummary": "Resumen de visitas",
+        "VisitsSummaryDocumentation": "Esta es una visión holística de la evolución de las visitas.",
+        "WidgetLastVisits": "Gráfica de las últimas visitas",
+        "WidgetOverviewGraph": "Visitas generales (con gráficas)",
+        "WidgetVisits": "Visión general de visitas"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/et.json
+++ b/www/analytics/plugins/VisitsSummary/lang/et.json
@ -0,0 +1,26 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "%s keskmine lehe genereerimise aeg",
+        "AverageVisitDuration": "%s keskmine külastuse kestvus",
+        "GenerateQueries": "%s katkestatud päringut",
+        "GenerateTime": "Lehe genereerimiseks kulus %s sekundit",
+        "MaxNbActions": "%s tegevust maksimaalselt ühel külastusel",
+        "NbActionsDescription": "%s tegevust",
+        "NbActionsPerVisit": "%s tegevust (lehe vaatamist, allalaadimist, väljuvat linki ja lehesisest otsingut) külastuse jooksul",
+        "NbDownloadsDescription": "%s allalaadimist",
+        "NbKeywordsDescription": "%s unikaalset võtmesõna",
+        "NbOutlinksDescription": "%s väljuvat linki",
+        "NbPageviewsDescription": "%s lehevaatamist",
+        "NbSearchesDescription": "%s otsingut kokku antud veebilehel",
+        "NbUniqueDownloadsDescription": "%s unikaalset allalaadimist",
+        "NbUniqueOutlinksDescription": "%s unikaalset väljuvat linki",
+        "NbUniquePageviewsDescription": "%s unikaalset lehevaatamist",
+        "NbUniqueVisitors": "%s unikaalset külastajat",
+        "NbVisitsBounced": "%s külastajaid põrkas (lahkus peale ühe lehe kuvamist)",
+        "VisitsSummary": "Külastuste kokkuvõte",
+        "VisitsSummaryDocumentation": "See on külastuste muutuse ajas ülevaade.",
+        "WidgetLastVisits": "Viimaste külastuste graafik",
+        "WidgetOverviewGraph": "Graafikutega ülevaade",
+        "WidgetVisits": "Külastuste ülevaade"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/eu.json
+++ b/www/analytics/plugins/VisitsSummary/lang/eu.json
@ -0,0 +1,13 @@
+{
+    "VisitsSummary": {
+        "GenerateQueries": "%s galdera exekutatuta",
+        "GenerateTime": "%s segundo orria sortzeko",
+        "MaxNbActions": "%s ekintza gehienez bisita batean",
+        "NbUniqueVisitors": "%s bisitari desberdin",
+        "NbVisitsBounced": "%s bisita errebotatu dira (webgunea utzi dute orri bat ikusi ondoren)",
+        "VisitsSummary": "Bisiten laburpena",
+        "WidgetLastVisits": "Azken bisiten grafikoa",
+        "WidgetOverviewGraph": "Ikuspegi orokorra grafikoarekin",
+        "WidgetVisits": "Bisiten ikuspegi orokorra"
+    }
+}
--- a/www/analytics/plugins/VisitsSummary/lang/fa.json
+++ b/www/analytics/plugins/VisitsSummary/lang/fa.json
@ -0,0 +1,26 @@
+{
+    "VisitsSummary": {
+        "AverageGenerationTime": "میانگین زمان ساخته شدن %s",
+        "AverageVisitDuration": "%s میانگین مدت بازدید",
+        "GenerateQueries": "%s پرس و جو های اجرا شده",
+        "GenerateTime": "%s ثانیه برای تولید صفحه",
+        "MaxNbActions": "%s بیشترین عملیات در یک بازدید",
+        "NbActionsDescription": "فعالیت ها %s",
+        "NbActionsPerVisit": "%s فعالیت(بازدیدصفحه ،دانلود ،جستجوی داخلی وبسایت) بر بازدید",
+        "NbDownloadsDescription": "دانلود ها %s",
+        "NbKeywordsDescription": "%s کلمه کلیدی یکتا",
+        "NbOutlinksDescription": "لینک های خروجی %s",
+        "NbPageviewsDescription": "نمایش صفحات %s",
+        "NbSearchesDescription": "%sهمه جستجوها روی وبسایت شما",
+        "NbUniqueDownloadsDescription": "دانلودهای منفرد %s",
+        "NbUniqueOutlinksDescription": "لینک های خروجی منفرد%s",
+        "NbUniquePageviewsDescription": "نمایش صفحات منفرد %s",
+        "NbUniqueVisitors": "%s بازدیدکنندگان منحصربفرد",
+        "NbVisitsBounced": "%sبازدید پس زده شده (بعدازبازدید یک صفحه از وبسایت خارج شده است)",
+        "VisitsSummary": "خلاصه بازدیدها",
+        "VisitsSummaryDocumentation": "این مروری بر تکامل بازدید است.",
+        "WidgetLastVisits": "نمودار آخرین بازدید ها",
+        "WidgetOverviewGraph": "مرور به وسیله نمودار",
+        "WidgetVisits": "مرور بازدید ها"
+    }
+}
--- a/Show more
+++ b/Show more