diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index fe8248fc89b54297ff2976a0cff2a59b3cecc2bb..6a37910e49172c519d534da4629c5a25695281b9 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -320,7 +320,7 @@ class API extends \Piwik\Plugin\API $dataTable->filter('ColumnCallbackDeleteRow', array('label', function ($url) { return !isSocialUrl($url); })); - $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url')); + $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSocialMainUrl')); $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getSocialNetworkFromDomain')); $this->setSocialIdSubtables($dataTable); @@ -530,4 +530,4 @@ class API extends \Piwik\Plugin\API } } -} \ No newline at end of file +} diff --git a/plugins/Referrers/functions.php b/plugins/Referrers/functions.php index 3a38cb1e5f71a861095e70fa136d9143f8a75167..3aa1f6a02113ea14a7e06ef70ec47c1c5ad147ab 100644 --- a/plugins/Referrers/functions.php +++ b/plugins/Referrers/functions.php @@ -29,6 +29,26 @@ function getPathFromUrl($url) return $path; } +/** + * Returns the main url of the social network the given url matches + * + * @param string $url + * + * @return string + */ +function getSocialMainUrl($url) +{ + $social = getSocialNetworkFromDomain($url); + foreach (Common::getSocialUrls() AS $domain => $name) { + + if($name == $social) { + + return $domain; + } + } + return $url; +} + /** * Get's social network name from URL. * diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml index e2bea9496f66ac25461c9936fd88b267c3026074..ea9ecf6f45e8687b202db00e1b9999905b818a6e 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml @@ -29,7 +29,7 @@ <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <url>fb.me</url> + <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> <row> @@ -82,4 +82,4 @@ </result> <result date="2010-12-16" /> </result> -</results> \ No newline at end of file +</results> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml index 30edc55a0ac1da07897211cd5f437f7334e51b8e..200eb30bc1de9d60e1b5a6475a7cdcca21d452be 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml @@ -10,7 +10,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <url>fb.me</url> + <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> <row> @@ -100,4 +100,4 @@ <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> </result> -</results> \ No newline at end of file +</results> diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php index 3fb7be7b2896d36bb08895f48789598231e9013f..068794fc287ec834ef3a169cb52f1f8e1f4ae7f6 100644 --- a/tests/PHPUnit/Plugins/ReferrersTest.php +++ b/tests/PHPUnit/Plugins/ReferrersTest.php @@ -187,7 +187,6 @@ class ReferrersTest extends PHPUnit_Framework_TestCase /** * @group Plugins - * @group Social * * @dataProvider getSocialsLogoFromUrlTestData */