Merge with master

5 files changed, 52 insertions, 36 deletions

diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 0864c517b5..3205edaf61 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -62,19 +62,7 @@ class Piwik_VisitsSummary_API
             $columns = array_merge($columns, $tempColumns);
         } else {
             $bounceRateRequested = $actionsPerVisitRequested = $averageVisitDurationRequested = true;
-            $columns = array(
-                'nb_visits',
-                'nb_actions',
-                'nb_visits_converted',
-                'bounce_count',
-                'sum_visit_length',
-                'max_actions'
-            );
-            if (Piwik::isUniqueVisitorsEnabled($period)) {
-                $columns = array_merge(array('nb_uniq_visitors'), $columns);
-            }
-            // Force reindex from 0 to N otherwise the SQL bind will fail
-            $columns = array_values($columns);
+            $columns = $this->getCoreColumns($period);
         }
 
         $dataTable = $archive->getDataTableFromNumeric($columns);
@@ -96,11 +84,38 @@ class Piwik_VisitsSummary_API
         return $dataTable;
     }
 
+    /**
+     * @ignore
+     */
+    public function getColumns($period)
+    {
+        $columns = $this->getCoreColumns($period);
+        $columns = array_merge($columns, array('bounce_rate', 'nb_actions_per_visit', 'avg_time_on_site'));
+        return $columns;
+    }
+
+    protected function getCoreColumns($period)
+    {
+        $columns = array(
+            'nb_visits',
+            'nb_actions',
+            'nb_visits_converted',
+            'bounce_count',
+            'sum_visit_length',
+            'max_actions'
+        );
+        if (Piwik::isUniqueVisitorsEnabled($period)) {
+            $columns = array_merge(array('nb_uniq_visitors'), $columns);
+        }
+        $columns = array_values($columns);
+        return $columns;
+    }
+
     protected function getNumeric($idSite, $period, $date, $segment, $toFetch)
     {
         Piwik::checkUserHasViewAccess($idSite);
         $archive = Piwik_Archive::build($idSite, $period, $date, $segment);
-        $dataTable = $archive->getNumeric($toFetch);
+        $dataTable = $archive->getDataTableFromNumeric($toFetch);
         return $dataTable;
     }
 
@@ -142,8 +157,9 @@ class Piwik_VisitsSummary_API
     public function getSumVisitsLengthPretty($idSite, $period, $date, $segment = false)
     {
         $table = $this->getSumVisitsLength($idSite, $period, $date, $segment);
-        if ($table instanceof Piwik_DataTable_Array) {
-            $table->filter('ColumnCallbackReplace', array(0, array('Piwik', 'getPrettyTimeFromSeconds')));
+        if (is_object($table)) {
+            $table->filter('ColumnCallbackReplace',
+                array('sum_visit_length', array('Piwik', 'getPrettyTimeFromSeconds')));
         } else {
             $table = Piwik::getPrettyTimeFromSeconds($table);
         }
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index e23680fc10..da846c23ed 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -129,7 +129,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
         $dataTableVisit = self::getVisitsSummary();
         $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Piwik_DataTable_Row() : $dataTableVisit->getFirstRow();
 
-        $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'), Piwik_Common::getRequestVar('segment', false));
+        $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'), Piwik_ViewDataTable::getRawSegmentFromRequest());
         $dataActionsRow =
             $dataTableActions->getRowsCount() == 0 ? new Piwik_DataTable_Row() : $dataTableActions->getFirstRow();
 
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index 87b320c947..0744b0424a 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -12,7 +12,7 @@
 /**
  * Note: This plugin does not hook on Daily and Period Archiving like other Plugins because it reports the
  * very core metrics (visits, actions, visit duration, etc.) which are processed in the Core
- * Piwik_ArchiveProcessing_Day class directly.
+ * Piwik_ArchiveProcessor_Day class directly.
  * These metrics can be used by other Plugins so they need to be processed up front.
  *
  * @package Piwik_VisitsSummary
diff --git a/plugins/VisitsSummary/templates/_sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig
index c3a22290b0..abeb3dbc5a 100644
--- a/plugins/VisitsSummary/templates/_sparklines.twig
+++ b/plugins/VisitsSummary/templates/_sparklines.twig
@@ -1,26 +1,26 @@
 <div id='leftcolumn'>
     <div class="sparkline">
         {{ sparkline(urlSparklineNbVisits)|raw }}
-        {{ 'VisitsSummary_NbVisits'|translate("<strong>"+nbVisits+"</strong>") }}{% if displayUniqueVisitors %},
-            {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"+nbUniqVisitors+"</strong>") }}{% endif %}
+        {{ 'VisitsSummary_NbVisits'|translate("<strong>"~nbVisits~"</strong>")|raw }}{% if displayUniqueVisitors %},
+            {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"~nbUniqVisitors~"</strong>")|raw }}{% endif %}
     </div>
     <div class="sparkline">
         {{ sparkline(urlSparklineAvgVisitDuration)|raw }}
         {% set averageVisitDuration=averageVisitDuration|sumtime %}
-        {{ 'VisitsSummary_AverageVisitDuration'|translate("<strong>"+averageVisitDuration+"</strong>") }}
+        {{ 'VisitsSummary_AverageVisitDuration'|translate("<strong>"~averageVisitDuration~"</strong>")|raw }}
     </div>
     <div class="sparkline">
         {{ sparkline(urlSparklineBounceRate)|raw }}
-        {{ 'VisitsSummary_NbVisitsBounced'|translate("<strong>"+bounceRate+"%</strong>") }}
+        {{ 'VisitsSummary_NbVisitsBounced'|translate("<strong>"~bounceRate~"%</strong>")|raw }}
     </div>
     <div class="sparkline">
         {{ sparkline(urlSparklineActionsPerVisit)|raw }}
-        {{ 'VisitsSummary_NbActionsPerVisit'|translate("<strong>"+nbActionsPerVisit+"</strong>") }}
+        {{ 'VisitsSummary_NbActionsPerVisit'|translate("<strong>"~nbActionsPerVisit~"</strong>")|raw }}
     </div>
 	<div class="sparkline">
         {{ sparkline(urlSparklineAvgGenerationTime)|raw }}
 		{% set averageGenerationTime=averageGenerationTime|sumtime %}
-		{{ 'VisitsSummary_AverageGenerationTime'|translate("<strong>"+averageGenerationTime+"</strong>") }}
+		{{ 'VisitsSummary_AverageGenerationTime'|translate("<strong>"~averageGenerationTime~"</strong>")|raw }}
 	</div>
 </div>
 
@@ -28,35 +28,35 @@
     {% if showOnlyActions %}
         <div class="sparkline">
             {{ sparkline(urlSparklineNbActions)|raw }}
-            {{ 'VisitsSummary_NbActionsDescription'|translate("<strong>"+nbActions+"</strong>") }}
+            {{ 'VisitsSummary_NbActionsDescription'|translate("<strong>"~nbActions~"</strong>")|raw }}
         </div>
     {% else %}
         <div class="sparkline">
             {{ sparkline(urlSparklineNbPageviews)|raw }}
-            {{ 'VisitsSummary_NbPageviewsDescription'|translate("<strong>"+nbPageviews+"</strong>")|trim }},
-            {{ 'VisitsSummary_NbUniquePageviewsDescription'|translate("<strong>"+nbUniquePageviews+"</strong>") }}
+            {{ 'VisitsSummary_NbPageviewsDescription'|translate("<strong>"~nbPageviews~"</strong>")|trim|raw }},
+            {{ 'VisitsSummary_NbUniquePageviewsDescription'|translate("<strong>"~nbUniquePageviews~"</strong>")|raw }}
         </div>
         {% if displaySiteSearch %}
             <div class="sparkline">
                 {{ sparkline(urlSparklineNbSearches)|raw }}
-                {{ 'VisitsSummary_NbSearchesDescription'|translate("<strong>"+nbSearches+"</strong>")|trim }},
-                {{ 'VisitsSummary_NbKeywordsDescription'|translate("<strong>"+nbKeywords+"</strong>") }}
+                {{ 'VisitsSummary_NbSearchesDescription'|translate("<strong>"~nbSearches~"</strong>")|trim|raw }},
+                {{ 'VisitsSummary_NbKeywordsDescription'|translate("<strong>"~nbKeywords~"</strong>")|raw }}
             </div>
         {% endif %}
         <div class="sparkline">
                 {{ sparkline(urlSparklineNbDownloads)|raw }}
-                {{ 'VisitsSummary_NbDownloadsDescription'|translate("<strong>"+nbDownloads+"</strong>")|trim }},
-                {{ 'VisitsSummary_NbUniqueDownloadsDescription'|translate("<strong>"+nbUniqueDownloads+"</strong>") }}
+                {{ 'VisitsSummary_NbDownloadsDescription'|translate("<strong>"~nbDownloads~"</strong>")|trim|raw }},
+                {{ 'VisitsSummary_NbUniqueDownloadsDescription'|translate("<strong>"~nbUniqueDownloads~"</strong>")|raw }}
         </div>
         <div class="sparkline">
                 {{ sparkline(urlSparklineNbOutlinks)|raw }}
-                {{ 'VisitsSummary_NbOutlinksDescription'|translate("<strong>"+nbOutlinks+"</strong>")|trim }},
-                {{ 'VisitsSummary_NbUniqueOutlinksDescription'|translate("<strong>"+nbUniqueOutlinks+"</strong>") }}
+                {{ 'VisitsSummary_NbOutlinksDescription'|translate("<strong>"~nbOutlinks~"</strong>")|trim|raw }},
+                {{ 'VisitsSummary_NbUniqueOutlinksDescription'|translate("<strong>"~nbUniqueOutlinks~"</strong>")|raw }}
         </div>
     {% endif %}
     <div class="sparkline">
             {{ sparkline(urlSparklineMaxActions)|raw }}
-            {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"+maxActions+"</strong>") }}
+            {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"~maxActions~"</strong>")|raw }}
     </div>
 </div>
 <div style="clear:both;"></div>
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index ec3aecc990..fad6c86bff 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -8,7 +8,7 @@
 {#
 Time page generation
 	<p style='color:lightgrey; size:0.8em;'>
-	{'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries}
-	{if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if}
+	{{ 'VisitsSummary_GenerateTime'|translate(totalTimeGeneration,totalNumberOfQueries) }}
+	{% if totalNumberOfQueries != 0 %}, {{ 'VisitsSummary_GenerateQueries'|translate(totalNumberOfQueries) }}{% endif %}
 	</p>
 #}