starting to move actions from tracker into plugins

5 files changed, 79 insertions, 63 deletions

diff --git a/plugins/Actions/Columns/ClickedUrl.php b/plugins/Actions/Columns/ClickedUrl.php
index f5d14fb5df..60790e39ab 100644
--- a/plugins/Actions/Columns/ClickedUrl.php
+++ b/plugins/Actions/Columns/ClickedUrl.php
@@ -10,9 +10,6 @@ namespace Piwik\Plugins\Actions\Columns;
 
 use Piwik\Piwik;
 use Piwik\Plugin\ActionDimension;
-use Piwik\Plugin\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\TableLogAction;
 
 class ClickedUrl extends ActionDimension
 {
@@ -20,29 +17,5 @@ class ClickedUrl extends ActionDimension
     {
         return Piwik::translate('Actions_ColumnClickedURL');
     }
-/*
-    public function shouldHandleAction(Request $request)
-    {
-        $link = $request->getParam('link');
-
-        return !empty($link);
-    }
-
-    public function getValue(Request $request)
-    {
-        $url = $request->getParam('link');
 
-        $ids = TableLogAction::loadIdsAction(array('idaction_url' => array($url, $this->getActionId())));
-
-        if (empty($ids['idaction_url'])) {
-            return false;
-        }
-
-        return (int) $ids['idaction_url'];
-    }
-
-    public function getActionId()
-    {
-        return 2;
-    }*/
 }
diff --git a/plugins/Actions/Columns/DownloadUrl.php b/plugins/Actions/Columns/DownloadUrl.php
index bfccd19d44..23b039b7a1 100644
--- a/plugins/Actions/Columns/DownloadUrl.php
+++ b/plugins/Actions/Columns/DownloadUrl.php
@@ -10,9 +10,6 @@ namespace Piwik\Plugins\Actions\Columns;
 
 use Piwik\Piwik;
 use Piwik\Plugin\ActionDimension;
-use Piwik\Plugin\VisitDimension;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\TableLogAction;
 
 class DownloadUrl extends ActionDimension
 {
@@ -20,29 +17,5 @@ class DownloadUrl extends ActionDimension
     {
         return Piwik::translate('Actions_ColumnDownloadURL');
     }
-/*
-    public function shouldHandleAction(Request $request)
-    {
-        $download = $request->getParam('download');
-
-        return !empty($download);
-    }
-
-    public function getValue(Request $request)
-    {
-        $url = $request->getParam('download');
 
-        $ids = TableLogAction::loadIdsAction(array('idaction_url' => array($url, $this->getActionId())));
-
-        if (empty($ids['idaction_url'])) {
-            return false;
-        }
-
-        return (int) $ids['idaction_url'];
-    }
-
-    public function getActionId()
-    {
-        return 3;
-    }*/
 }
diff --git a/plugins/Actions/Columns/PageTitle.php b/plugins/Actions/Columns/PageTitle.php
index 2b0385717b..5c4ff21372 100644
--- a/plugins/Actions/Columns/PageTitle.php
+++ b/plugins/Actions/Columns/PageTitle.php
@@ -30,14 +30,5 @@ class PageTitle extends ActionDimension
     {
         return Piwik::translate('Actions_ColumnPageName');
     }
-/*
-    public function shouldHandleAction(Request $request)
-    {
-        return true;
-    }
 
-    public function getActionId()
-    {
-        return 4;
-    }*/
 }
diff --git a/plugins/Actions/Columns/ServerTime.php b/plugins/Actions/Columns/ServerTime.php
new file mode 100644
index 0000000000..802799bb25
--- /dev/null
+++ b/plugins/Actions/Columns/ServerTime.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Actions\Columns;
+
+use Piwik\Common;
+use Piwik\Db;
+use Piwik\Plugin\ActionDimension;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
+use Piwik\Tracker;
+
+class ServerTime extends ActionDimension
+{
+    protected $fieldName = 'server_time';
+    protected $fieldType = 'DATETIME NOT NULL';
+
+    public function install()
+    {
+        parent::install();
+
+        $sql = "ALTER TABLE `" . Common::prefixTable("log_link_visit_action") . "` ADD INDEX index_idsite_servertime ( idsite, server_time )";
+        Db::exec($sql);
+    }
+
+    public function getName()
+    {
+        return '';
+    }
+
+    public function onNewAction(Request $request, Action $action, Visitor $visitor)
+    {
+        $timestamp = $request->getCurrentTimestamp();
+
+        return Tracker::getDatetimeFromTimestamp($timestamp);
+    }
+}
diff --git a/plugins/Actions/Columns/TimeSpentRefAction.php b/plugins/Actions/Columns/TimeSpentRefAction.php
new file mode 100644
index 0000000000..44a1094348
--- /dev/null
+++ b/plugins/Actions/Columns/TimeSpentRefAction.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Actions\Columns;
+
+use Piwik\Plugin\ActionDimension;
+use Piwik\Tracker\Action;
+use Piwik\Tracker\Request;
+use Piwik\Tracker;
+
+class TimeSpentRefAction extends ActionDimension
+{
+    protected $fieldName = 'time_spent_ref_action';
+    protected $fieldType = 'INTEGER(10) UNSIGNED NOT NULL';
+
+    public function getName()
+    {
+        return '';
+    }
+
+    public function onNewAction(Request $request, Action $action, Tracker\Visitor $visitor)
+    {
+        $timeSpent = $visitor->getVisitorColumn('time_spent_ref_action');
+
+        if (empty($timeSpent)) {
+            return 0;
+        }
+
+        return $timeSpent;
+    }
+}