Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-07-03 10:31:21 +0300
committerGitHub <noreply@github.com>2020-07-03 10:31:21 +0300
commite9455ccfa5f4780b65685ad15636bdab0010cc28 (patch)
treef85054397546f70398c890e4de108d01b88035e5 /plugins
parent50c8303ebf3f6503211a453bb9537febd8dab3d6 (diff)
Add method to enable cookies in JS (#16113)
* Better detection for cookies for browser plugins report * rebuilt piwik.js * improve comment * Add method to enable cookies * rebuilt piwik.js * fix test * no longer include cookie in fingerprint * only ignore cookies in fingerprint for IE * fix tests * fix test * tweak enablecookies * rebuilt piwik.js * send tracking request if needed when enable cookies * rebuilt piwik.js * tweak code * update docs * rebuilt piwik.js * Update Visit.php * fix tests * rebuilt piwik.js Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml8
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__API.getSuggestedValuesForSegment.xml4
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__VisitsSummary.get_range.xml10
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml2
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml2
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__VisitsSummary.get_month.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml6
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml2
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml4
-rw-r--r--plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__VisitsSummary.get_month.xml2
-rw-r--r--plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml4
-rw-r--r--plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml4
-rw-r--r--plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml2
-rw-r--r--plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml2
18 files changed, 31 insertions, 31 deletions
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 88cb9a1057..e953504b8e 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -3166,7 +3166,7 @@
<idVisit>28</idVisit>
<visitIp>2003:f6:93bf:26f:9ec7:a6ff:fe29:27df</visitIp>
- <fingerprint>b6f1d5120b2b15a2</fingerprint>
+ <fingerprint>47b25ed9972126db</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -3558,7 +3558,7 @@
<idVisit>27</idVisit>
<visitIp>2003:f6:93bf:26f:9ec7:a6ff:fe29:27df</visitIp>
- <fingerprint>b6f1d5120b2b15a2</fingerprint>
+ <fingerprint>47b25ed9972126db</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -4153,7 +4153,7 @@
<idVisit>26</idVisit>
<visitIp>137.82.0.0</visitIp>
- <fingerprint>31ea532c06bf48a0</fingerprint>
+ <fingerprint>02bc7f4e9b9d3069</fingerprint>
<actionDetails>
<row>
<type>action</type>
@@ -4895,7 +4895,7 @@
<idVisit>25</idVisit>
<visitIp>137.82.0.0</visitIp>
- <fingerprint>31ea532c06bf48a0</fingerprint>
+ <fingerprint>02bc7f4e9b9d3069</fingerprint>
<actionDetails>
<row>
<type>action</type>
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__API.getSuggestedValuesForSegment.xml
index 77a1416d61..53b737fd3a 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__API.getSuggestedValuesForSegment.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>02bc7f4e9b9d3069</row>
<row>05f59d2b325126c8</row>
<row>0fc8a7b5c1071e7d</row>
<row>17b5ac19cce8a192</row>
<row>289e2fcbb06929fa</row>
<row>28a7ee52024f3a89</row>
- <row>31ea532c06bf48a0</row>
<row>3e5f540b8952a4ab</row>
+ <row>47b25ed9972126db</row>
<row>65eefc1c2b3aa35c</row>
<row>85aaa85a2071daf5</row>
<row>9b641f2d195745f4</row>
<row>a36244db4114afa7</row>
- <row>b6f1d5120b2b15a2</row>
<row>cc20676f98f5d568</row>
<row>d5a95c7fe2a8286d</row>
<row>e61a3357f12d99f5</row>
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__VisitsSummary.get_range.xml
index d2daf5d2f8..18529da9ad 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__VisitsSummary.get_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_fingerprint__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<nb_visits>2</nb_visits>
- <nb_actions>6</nb_actions>
+ <nb_actions>5</nb_actions>
<nb_visits_converted>2</nb_visits_converted>
<bounce_count>1</bounce_count>
- <sum_visit_length>1623</sum_visit_length>
- <max_actions>5</max_actions>
+ <sum_visit_length>1622</sum_visit_length>
+ <max_actions>4</max_actions>
<bounce_rate>50%</bounce_rate>
- <nb_actions_per_visit>3</nb_actions_per_visit>
- <avg_time_on_site>812</avg_time_on_site>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
index 703ec64682..2bf75e28d9 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
@@ -24,7 +24,7 @@
</row>
<row>
<label>Unknown</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_uniq_visitors>3</nb_uniq_visitors>
<nb_visits>3</nb_visits>
<nb_actions>3</nb_actions>
<nb_users>0</nb_users>
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
index 2d6509f655..1e4dc2c09c 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
@@ -44,7 +44,7 @@
</row>
<row>
<label>Unknown</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<nb_users>0</nb_users>
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
index d959ebf6cb..6a22c1926e 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
@@ -46,7 +46,7 @@
</row>
<row>
<label>Unknown</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
<nb_users>0</nb_users>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml
index e93486db7f..bab0c070fe 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__UserId.getUsers_month.xml
@@ -8,7 +8,7 @@
<sum_visit_length>741</sum_visit_length>
<bounce_count>16</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>userId==user3</segment>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__VisitsSummary.get_month.xml
index 94efd54469..1a39b7f201 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__VisitsSummary.get_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_admin__VisitsSummary.get_month.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>40</nb_uniq_visitors>
+ <nb_uniq_visitors>32</nb_uniq_visitors>
<nb_users>2</nb_users>
<nb_visits>46</nb_visits>
<nb_actions>71</nb_actions>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml
index 0b5f83f67f..1b8d11ed80 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml
@@ -8,7 +8,7 @@
<sum_visit_length>1108</sum_visit_length>
<bounce_count>20</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<segment>userId==user4</segment>
@@ -21,7 +21,7 @@
<sum_visit_length>741</sum_visit_length>
<bounce_count>16</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>userId==user3</segment>
@@ -34,7 +34,7 @@
<sum_visit_length>735</sum_visit_length>
<bounce_count>11</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>userId==user2</segment>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml
index 23b293cf53..08f7443bc2 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>150</nb_uniq_visitors>
+ <nb_uniq_visitors>129</nb_uniq_visitors>
<nb_users>4</nb_users>
<nb_visits>191</nb_visits>
<nb_actions>264</nb_actions>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml
index cf949e8960..cf6bdf7b39 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml
@@ -8,7 +8,7 @@
<sum_visit_length>1108</sum_visit_length>
<bounce_count>20</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>40</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>3</sum_daily_nb_users>
<segment>userId==user4</segment>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml
index 0dec751572..e313f2d65c 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>50</nb_uniq_visitors>
+ <nb_uniq_visitors>39</nb_uniq_visitors>
<nb_users>2</nb_users>
<nb_visits>56</nb_visits>
<nb_actions>88</nb_actions>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml
index a43820c465..a93e3ad323 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__UserId.getUsers_month.xml
@@ -8,7 +8,7 @@
<sum_visit_length>741</sum_visit_length>
<bounce_count>16</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>userId==user3</segment>
@@ -21,7 +21,7 @@
<sum_visit_length>735</sum_visit_length>
<bounce_count>11</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<segment>userId==user2</segment>
diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__VisitsSummary.get_month.xml
index 22d38cc245..5260391e84 100644
--- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__VisitsSummary.get_month.xml
+++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_women__VisitsSummary.get_month.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>50</nb_uniq_visitors>
+ <nb_uniq_visitors>40</nb_uniq_visitors>
<nb_users>2</nb_users>
<nb_visits>56</nb_visits>
<nb_actions>88</nb_actions>
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
index fc8e450e2e..3090feda54 100644
--- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
@@ -8,7 +8,7 @@
<sum_visit_length>12</sum_visit_length>
<bounce_count>19</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
<segment>userId==user3</segment>
@@ -21,7 +21,7 @@
<sum_visit_length>8</sum_visit_length>
<bounce_count>13</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
<segment>userId==user2</segment>
diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
index 4c4facb17c..b5f86f39ff 100644
--- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
@@ -21,7 +21,7 @@
<sum_visit_length>8</sum_visit_length>
<bounce_count>13</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
<segment>userId==user2</segment>
@@ -34,7 +34,7 @@
<sum_visit_length>12</sum_visit_length>
<bounce_count>19</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>31</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
<segment>userId==user3</segment>
diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
index 0ebc46bfd4..1af4e99409 100644
--- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
@@ -8,7 +8,7 @@
<sum_visit_length>8</sum_visit_length>
<bounce_count>13</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
<segment>userId==user2</segment>
diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
index 14cd163444..972054de1e 100644
--- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
@@ -8,7 +8,7 @@
<sum_visit_length>8</sum_visit_length>
<bounce_count>13</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>21</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
<segment>userId==user2</segment>