update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/Events/Columns/EventAction.php

@@ -0,0 +1,56 @@
+<?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\Events\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\ActionDimension;
+use Piwik\Plugins\Events\Segment;
+use Piwik\Plugins\Events\Actions\ActionEvent;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+
+class EventAction extends ActionDimension
+{
+    protected $columnName = 'idaction_event_action';
+    protected $columnType = 'INTEGER(10) UNSIGNED DEFAULT NULL';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('eventAction');
+        $segment->setName('Events_EventAction');
+        $this->addSegment($segment);
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('Events_EventAction');
+    }
+
+    public function getActionId()
+    {
+        return Action::TYPE_EVENT_ACTION;
+    }
+
+    public function onLookupAction(Request $request, Action $action)
+    {
+        if (!($action instanceof ActionEvent)) {
+            return false;
+        }
+
+        $eventAction = $request->getParam('e_a');
+        $eventAction = trim($eventAction);
+
+        if (strlen($eventAction) > 0) {
+            return $eventAction;
+        }
+
+        return false;
+    }
+}

www/analytics/plugins/Events/Columns/EventCategory.php

@@ -0,0 +1,56 @@
+<?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\Events\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\ActionDimension;
+use Piwik\Plugins\Events\Segment;
+use Piwik\Plugins\Events\Actions\ActionEvent;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+
+class EventCategory extends ActionDimension
+{
+    protected $columnName = 'idaction_event_category';
+    protected $columnType = 'INTEGER(10) UNSIGNED DEFAULT NULL';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('eventCategory');
+        $segment->setName('Events_EventCategory');
+        $this->addSegment($segment);
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('Events_EventCategory');
+    }
+
+    public function getActionId()
+    {
+        return Action::TYPE_EVENT_CATEGORY;
+    }
+
+    public function onLookupAction(Request $request, Action $action)
+    {
+        if (!($action instanceof ActionEvent)) {
+            return false;
+        }
+
+        $eventCategory = $request->getParam('e_c');
+        $eventCategory = trim($eventCategory);
+
+        if (strlen($eventCategory) > 0) {
+            return $eventCategory;
+        }
+
+        return false;
+    }
+}

www/analytics/plugins/Events/Columns/EventName.php

@@ -0,0 +1,55 @@
+<?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\Events\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\ActionDimension;
+use Piwik\Plugins\Events\Segment;
+use Piwik\Plugins\Events\Actions\ActionEvent;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+
+class EventName extends ActionDimension
+{
+    protected $columnName = 'idaction_name';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('eventName');
+        $segment->setName('Events_EventName');
+        $this->addSegment($segment);
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('Events_EventName');
+    }
+
+    public function getActionId()
+    {
+        return Action::TYPE_EVENT_NAME;
+    }
+
+    public function onLookupAction(Request $request, Action $action)
+    {
+        if (!($action instanceof ActionEvent)) {
+            return false;
+        }
+
+        $eventName = $request->getParam('e_n');
+        $eventName = trim($eventName);
+
+        if (strlen($eventName) > 0) {
+            return $eventName;
+        }
+
+        return false;
+    }
+}

www/analytics/plugins/Events/Columns/Metrics/AverageEventValue.php

@@ -0,0 +1,45 @@
+<?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\Events\Columns\Metrics;
+
+use Piwik\DataTable\Row;
+use Piwik\Piwik;
+use Piwik\Plugin\ProcessedMetric;
+
+/**
+ * The average value for a triggered event. Calculated as:
+ *
+ *     sum_event_value / nb_events_with_value
+ *
+ * sum_event_value and nb_events_with_value are calculated by the Event archiver.
+ */
+class AverageEventValue extends ProcessedMetric
+{
+    public function getName()
+    {
+        return 'avg_event_value';
+    }
+
+    public function getTranslatedName()
+    {
+        return Piwik::translate('Events_AvgValueDocumentation');
+    }
+
+    public function compute(Row $row)
+    {
+        $sumEventValue = $this->getMetric($row, 'sum_event_value');
+        $eventsWithValue = $this->getMetric($row, 'nb_events_with_value');
+
+        return Piwik::getQuotientSafe($sumEventValue, $eventsWithValue, $precision = 2);
+    }
+
+    public function getDependentMetrics()
+    {
+        return array('sum_event_value', 'nb_events_with_value');
+    }
+}

www/analytics/plugins/Events/Columns/TotalEvents.php

@@ -0,0 +1,77 @@
+<?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\Events\Columns;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Dimension\VisitDimension;
+use Piwik\Plugin\Segment;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+
+class TotalEvents extends VisitDimension
+{
+    protected $columnName = 'visit_total_events';
+    protected $columnType = 'SMALLINT(5) UNSIGNED NOT NULL';
+
+    protected function configureSegments()
+    {
+        $segment = new Segment();
+        $segment->setSegment('events');
+        $segment->setName('Events_TotalEvents');
+        $segment->setAcceptedValues('To select all visits who triggered an Event, use: &segment=events>0');
+        $segment->setCategory('General_Visit');
+        $segment->setType(Segment::TYPE_METRIC);
+        $this->addSegment($segment);
+    }
+
+    public function getName()
+    {
+        return Piwik::translate('Events_EventName');
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
+    {
+        if ($this->isEventAction($action)) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    /**
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return int
+     */
+    public function onExistingVisit(Request $request, Visitor $visitor, $action)
+    {
+        if ($this->isEventAction($action)) {
+            return 'visit_total_events + 1';
+        }
+
+        return false;
+    }
+
+    /**
+     * @param Action|null $action
+     * @return bool
+     */
+    private function isEventAction($action)
+    {
+        return ($action && $action->getActionType() == Action::TYPE_EVENT);
+    }
+}