refs #4633 rename segment filter to segment, fixed a bug re visitTime and extracted code into a filter

1 files changed, 2 insertions, 20 deletions

diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index c78534c193..928e8c95f3 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -52,30 +52,12 @@ class API extends \Piwik\Plugin\API
         $table = $this->getDataTable(Archiver::SERVER_TIME_RECORD_NAME, $idSite, $period, $date, $segment);
 
         $timezone = Site::getTimezoneFor($idSite);
-
-        $range = Range::parseDateRange($date);
-
-        if (!empty($range[2])) {
-            $endDate = Date::factory($range[2]);
-        } else if (!empty($range[1])) {
-            $endDate = Date::factory($range[1]);
-        } else {
-            $endDate = Date::factory($date);
-        }
-
-        $table->filter('AddSegmentValue', array(function ($label) use ($timezone, $endDate) {
-            $hour = str_pad($label, 2, 0, STR_PAD_LEFT);
-            $time = $hour . ':00:00';
-
-            $dateInTimezone = $endDate->setTime($time)->setTimezone($timezone);
-            $hourInTz = $dateInTimezone->getHourInUTC();
-
-            return $hourInTz;
-        }));
+        $table->filter('Piwik\Plugins\VisitTime\DataTable\Filter\AddSegmentByLabelInUTC', array($timezone, $period, $date));
 
         if ($hideFutureHoursWhenToday) {
             $table = $this->removeHoursInFuture($table, $idSite, $period, $date);
         }
+
         return $table;
     }