Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

1 files changed, 156 insertions, 92 deletions

diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index f6dd1d8a7e..ba52b97d0d 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -177,107 +177,171 @@ class UserSettings extends \Piwik\Plugin
 
     public function getReportDisplayProperties(&$properties)
     {
-        $basicUserSettingsProperties = array('show_search'                 => false,
-                                             'show_exclude_low_population' => false,
-                                             'filter_limit'                => 5,
-                                             'graph_limit'                 => 5);
+        $properties['UserSettings.getResolution'] = $this->getDisplayPropertiesForGetResolution();
+        $properties['UserSettings.getConfiguration'] = $this->getDisplayPropertiesForGetConfiguration();
+        $properties['UserSettings.getOS'] = $this->getDisplayPropertiesForGetOS();
+        $properties['UserSettings.getOSFamily'] = $this->getDisplayPropertiesForGetOSFamily();
+        $properties['UserSettings.getBrowserVersion'] = $this->getDisplayPropertiesForGetBrowserVersion();
+        $properties['UserSettings.getBrowser'] = $this->getDisplayPropertiesForGetBrowser();
+        $properties['UserSettings.getBrowserType'] = $this->getDisplayPropertiesForGetBrowserType();
+        $properties['UserSettings.getWideScreen'] = $this->getDisplayPropertiesForGetWideScreen();
+        $properties['UserSettings.getMobileVsDesktop'] = $this->getDisplayPropertiesForGetMobileVsDesktop();
+        $properties['UserSettings.getPlugin'] = $this->getDisplayPropertiesForGetPlugin();
+        $properties['UserSettings.getLanguage'] = $this->getDisplayPropertiesForGetLanguage();
+    }
 
-        $osRelatedReports = array(
-            'UserSettings.getOSFamily' => Piwik_Translate('UserSettings_OperatingSystemFamily'),
-            'UserSettings.getOS'       => Piwik_Translate('UserSettings_OperatingSystems')
+    private function getDisplayPropertiesForGetResolution()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations' => array('label' => Piwik_Translate('UserSettings_ColumnResolution'))
+        ));
+    }
+
+    private function getDisplayPropertiesForGetConfiguration()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'filter_limit' => 3,
+            'translations' => array('label' => Piwik_Translate('UserSettings_ColumnConfiguration'))
+        ));
+    }
+
+    private function getDisplayPropertiesForGetOS()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnOperatingSystem')),
+            'title'          => Piwik_Translate('UserSettings_OperatingSystems'),
+            'related_reports' => $this->getOsRelatedReports()
+        ));
+    }
+
+    private function getDisplayPropertiesForGetOSFamily()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'   => array('label' => Piwik_Translate('UserSettings_OperatingSystemFamily')),
+            'title'          => Piwik_Translate('UserSettings_OperatingSystemFamily'),
+            'related_reports' => $this->getOsRelatedReports()
+        ));
+    }
+
+    private function getDisplayPropertiesForGetBrowserVersion()
+    {
+        $result = array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnBrowserVersion')),
+            'title'          => Piwik_Translate('UserSettings_ColumnBrowserVersion'),
+            'related_reports' => $this->getBrowserRelatedReports()
+        ));
+        $result['visualization_properties']['jqplot_graph']['max_graph_elements'] = 7;
+        return $result;
+    }
+
+    private function getDisplayPropertiesForGetBrowser()
+    {
+        $result = array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnBrowser')),
+            'title'          => Piwik_Translate('UserSettings_Browsers'),
+            'related_reports' => $this->getBrowserRelatedReports()
+        ));
+        $result['visualization_properties']['jqplot_graph']['max_graph_elements'] = 7;
+        return $result;
+    }
+
+    private function getDisplayPropertiesForGetBrowserType()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'            => array('label' => Piwik_Translate('UserSettings_ColumnBrowserFamily')),
+            'show_offset_information' => false,
+            'show_pagination_control' => false,
+            'default_view_type'       => 'graphPie',
+        ));
+    }
+
+    private function getDisplayPropertiesForGetWideScreen()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'            => array('label' => Piwik_Translate('UserSettings_ColumnTypeOfScreen')),
+            'show_offset_information' => false,
+            'show_pagination_control' => false,
+            'title'                   => Piwik_Translate('UserSettings_ColumnTypeOfScreen'),
+            'related_reports'          => $this->getWideScreenDeviceTypeRelatedReports()
+        ));
+    }
+
+    private function getDisplayPropertiesForGetMobileVsDesktop()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'            => array('label' => Piwik_Translate('UserSettings_MobileVsDesktop')),
+            'title'                   => Piwik_Translate('UserSettings_MobileVsDesktop'),
+            'related_reports'          => $this->getWideScreenDeviceTypeRelatedReports()
+        ));
+    }
+
+    private function getDisplayPropertiesForGetPlugin()
+    {
+        return array_merge($this->getBasicUserSettingsDisplayProperties(), array(
+            'translations'             => array(
+                'label'                => Piwik_Translate('UserSettings_ColumnPlugin'),
+                'nb_visits_percentage' =>
+                    str_replace(' ', ' ', Piwik_Translate('General_ColumnPercentageVisits'))
+            ),
+            'show_offset_information'  => false,
+            'show_pagination_control'  => false,
+            'show_all_views_icons'     => false,
+            'show_table_all_columns'   => false,
+            'columns_to_display'       => array('label', 'nb_visits_percentage', 'nb_visits'),
+            'filter_sort_column'       => 'nb_visits_percentage',
+            'filter_sort_order'        => 'desc',
+            'filter_limit'             => 10,
+            'show_footer_message'      => Piwik_Translate('UserSettings_PluginDetectionDoesNotWorkInIE'),
+        ));
+    }
+
+    private function getDisplayPropertiesForGetLanguage()
+    {
+        return array(
+            'translations'  => array('label' => Piwik_Translate('General_Language')),
+            'filter_sort_column'          => 'nb_visits',
+            'filter_sort_order'           => 'desc',
+            'show_search'                 => false,
+            'columns_to_display'          => array('label', 'nb_visits'),
+            'show_exclude_low_population' => false,
+        );
+    }
+
+    private function getWideScreenDeviceTypeRelatedReports()
+    {
+        return array(
+            'UserSettings.getMobileVsDesktop' => Piwik_Translate('UserSettings_MobileVsDesktop'),
+            'UserSettings.getWideScreen' => Piwik_Translate('UserSettings_ColumnTypeOfScreen')
         );
+    }
 
-        $browserRelatedReports = array(
-            'UserSettings.getBrowser'        => Piwik_Translate('UserSettings_Browsers'),
+    private function getBrowserRelatedReports()
+    {
+        return array(
+            'UserSettings.getBrowser' => Piwik_Translate('UserSettings_Browsers'),
             'UserSettings.getBrowserVersion' => Piwik_Translate('UserSettings_ColumnBrowserVersion')
         );
+    }
 
-        $wideScreenDeviceTypeRelatedReports = array(
-            'UserSettings.getMobileVsDesktop' => Piwik_Translate('UserSettings_MobileVsDesktop'),
-            'UserSettings.getWideScreen'      => Piwik_Translate('UserSettings_ColumnTypeOfScreen')
+    private function getOsRelatedReports()
+    {
+        return array(
+            'UserSettings.getOSFamily' => Piwik_Translate('UserSettings_OperatingSystemFamily'),
+            'UserSettings.getOS'       => Piwik_Translate('UserSettings_OperatingSystems')
         );
+    }
 
-        $properties['UserSettings.getResolution'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                   'translations' => array('label' => Piwik_Translate('UserSettings_ColumnResolution'))
-                                                                                              ));
-
-        $properties['UserSettings.getConfiguration'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                      'filter_limit' => 3,
-                                                                                                      'translations' => array('label' => Piwik_Translate('UserSettings_ColumnConfiguration'))
-                                                                                                 ));
-
-        $properties['UserSettings.getOS'] = array_merge($basicUserSettingsProperties, array(
-                                                                                           'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnOperatingSystem')),
-                                                                                           'title'          => Piwik_Translate('UserSettings_OperatingSystems'),
-                                                                                           'relatedReports' => $osRelatedReports
-                                                                                      ));
-
-        $properties['UserSettings.getOSFamily'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                 'translations'   => array('label' => Piwik_Translate('UserSettings_OperatingSystemFamily')),
-                                                                                                 'title'          => Piwik_Translate('UserSettings_OperatingSystemFamily'),
-                                                                                                 'relatedReports' => $osRelatedReports
-                                                                                            ));
-
-        $properties['UserSettings.getBrowserVersion'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                       'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnBrowserVersion')),
-                                                                                                       'graph_limit'    => 7,
-                                                                                                       'title'          => Piwik_Translate('UserSettings_ColumnBrowserVersion'),
-                                                                                                       'relatedReports' => $browserRelatedReports
-                                                                                                  ));
-
-        $properties['UserSettings.getBrowser'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                'translations'   => array('label' => Piwik_Translate('UserSettings_ColumnBrowser')),
-                                                                                                'graph_limit'    => 7,
-                                                                                                'title'          => Piwik_Translate('UserSettings_Browsers'),
-                                                                                                'relatedReports' => $browserRelatedReports
-                                                                                           ));
-
-        $properties['UserSettings.getBrowserType'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                    'translations'            => array('label' => Piwik_Translate('UserSettings_ColumnBrowserFamily')),
-                                                                                                    'show_offset_information' => false,
-                                                                                                    'show_pagination_control' => false,
-                                                                                                    'default_view_type'       => 'graphPie',
-                                                                                               ));
-
-        $properties['UserSettings.getWideScreen'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                   'translations'            => array('label' => Piwik_Translate('UserSettings_ColumnTypeOfScreen')),
-                                                                                                   'show_offset_information' => false,
-                                                                                                   'show_pagination_control' => false,
-                                                                                                   'title'                   => Piwik_Translate('UserSettings_ColumnTypeOfScreen'),
-                                                                                                   'relatedReports'          => $wideScreenDeviceTypeRelatedReports
-                                                                                              ));
-
-        $properties['UserSettings.getMobileVsDesktop'] = array_merge($basicUserSettingsProperties, array(
-                                                                                                        'translations'   => array('label' => Piwik_Translate('UserSettings_MobileVsDesktop')),
-                                                                                                        'title'          => Piwik_Translate('UserSettings_MobileVsDesktop'),
-                                                                                                        'relatedReports' => $wideScreenDeviceTypeRelatedReports
-                                                                                                   ));
-
-        $properties['UserSettings.getPlugin'] = array_merge($basicUserSettingsProperties, array(
-                                                                                               'translations'            => array(
-                                                                                                   'label'                => Piwik_Translate('UserSettings_ColumnPlugin'),
-                                                                                                   'nb_visits_percentage' =>
-                                                                                                   str_replace(' ', ' ', Piwik_Translate('General_ColumnPercentageVisits'))
-                                                                                               ),
-                                                                                               'show_offset_information' => false,
-                                                                                               'show_pagination_control' => false,
-                                                                                               'show_all_views_icons'    => false,
-                                                                                               'show_table_all_columns'  => false,
-                                                                                               'columns_to_display'      => array('label', 'nb_visits_percentage', 'nb_visits'),
-                                                                                               'filter_sort_column'      => 'nb_visits_percentage',
-                                                                                               'filter_sort_order'       => 'desc',
-                                                                                               'filter_limit'            => 10,
-                                                                                               'show_footer_message'     => Piwik_Translate('UserSettings_PluginDetectionDoesNotWorkInIE'),
-                                                                                          ));
-
-        $properties['UserSettings.getLanguage'] = array(
-            'translations'                => array('label' => Piwik_Translate('General_Language')),
-            'filter_sort_column'          => 'nb_visits',
-            'filter_sort_order'           => 'desc',
+    private function getBasicUserSettingsDisplayProperties()
+    {
+        return array(
             'show_search'                 => false,
-            'filter_limit'                => false,
-            'columns_to_display'          => array('label', 'nb_visits'),
             'show_exclude_low_population' => false,
+            'filter_limit'                => 5,
+            'visualization_properties' => array(
+                'jqplot_graph' => array(
+                    'max_graph_elements' => 5
+                )
+            )
         );
     }
 
@@ -387,4 +451,4 @@ class UserSettings extends \Piwik\Plugin
             $archiving->archivePeriod();
         }
     }
-}
+}
\ No newline at end of file