Add possibility to manage and view Intranet websites #13473

tsteur · 2018-09-24T04:17:11Z

@mattab is this what you had in mind?

need to see how to write tests for it.

tsteur · 2018-09-24T04:17:25Z

core/Tracker/Visit.php

@@ -65,11 +65,6 @@ class Visit implements VisitInterface
     */
    protected $visitProperties;

-    /**


wasn't used...

tsteur · 2018-09-24T04:51:18Z

FYI: Currently no site values will be saved except for trust cookies... need to figure out a way to make this happen

mattab · 2018-09-24T09:40:38Z

Feedback:

Would change the inline help to This should be enabled on an intranet website for accurate unique visitor tracking. Most visitors viewing an intranet will all have the same IP address, and often the same browser and operating system, which can cause Matomo to under-report the number of visits and unique visitors (if this setting is disabled).
could we append eg. "Trust visitors cookies (Recommended)"
initially was even thinking to always enable this setting for Intranet website and not even expose it? but more flexible probably to expose it...

mattab · 2018-09-24T10:25:53Z

Also

let's document how to convert a website to an intranet website? Can this be done with a simple SQL query, which one? this will be useful to have somewhere documented (even if just here)

tsteur · 2018-09-24T18:45:51Z

Much better could be to create a new "Intranet" website type in Core Matomo. For Intranet websites, we directly enable the trust_visitor_cookies setting. This setting becomes a "website setting" de-activable in the UI and visible only for intranet sites.

I'll remove the setting again. must have misunderstood this one.

tsteur · 2018-09-24T20:33:12Z

Removed the setting again and all related tests. Makes it easier :)

Added tests for the tracking part, should work.

mattab · 2018-09-24T20:59:28Z

must have misunderstood this one.

Forgot to reread the description so had missed this. But better we take the simplest approach 👍

diosmosis · 2018-09-25T20:43:27Z

plugins/IntranetMeasurable/Tracker/RequestProcessor.php

+        } elseif ($this->didEnableSetting) {
+            // we reset it in case of bulk tracking with different sites etc
+            $this->setTrustCookiesSetting(0);
+            $this->didEnableSetting = true;


I might be wrong, but I'm not sure this is needed? Could just use an else and unset it if it's not intranet.

Or is it in case another plugin decides to unset it? Actually, won't this ignore the config value then when setting it back?

diosmosis · 2018-09-25T20:46:44Z

plugins/IntranetMeasurable/lang/en.json

+    "IntranetMeasurable": {
+        "Intranet": "Intranet",
+        "Intranets": "Intranets",
+        "IntranetDescription": "An intranet measurable is just like a website but hosted on an internal network."


Since an intranet is the actual internal network, do you think "Intranet Website" might be a better term to use?

tsteur · 2018-09-25T21:01:16Z

Made the changes, will likely need to fix the tests after this

diosmosis · 2018-09-25T21:05:47Z

plugins/IntranetMeasurable/Tracker/RequestProcessor.php

+            $this->didEnableSetting = true;
+        } elseif ($this->didEnableSetting) {
+            // we reset it in case of bulk tracking with different sites etc
+            $this->setTrustCookiesSetting(0);


Was actually thinking about this line. If [General] trust_visitors_cookies is set to 1, then this will undo that setting, right?

only if we enabled it before, which we wouldn't have in this case when it is already enabled in https://github.com/matomo-org/matomo/pull/13473/files#diff-74231b57ce12fbc00990b9d88e26426dR26

Ok, gotcha, missed the DI get

diosmosis · 2018-09-28T03:36:11Z

Looks like there are some integration test failures. The JsProxyTest one passes for me locally...

tsteur · 2018-09-28T04:28:36Z

I'll restart the cancelled PR builds

tsteur · 2018-09-28T04:33:55Z

Locally the test works for me as well

tsteur · 2018-10-01T20:37:29Z

Test is still failing on travis, locally works. not sure why.

tsteur · 2018-10-01T20:49:50Z

@diosmosis @mattab @sgiehl do you know why this test would check for url http://localhost//js/?idsite=1 when it says testPiwikPhp in https://github.com/matomo-org/matomo/blob/3.x-dev/tests/PHPUnit/Integration/JsProxyTest.php#L56 ?

fails probably because of a missing htaccess or so? Not sure why it suddenly fails... maybe changing to js/index.php be fine?

diosmosis · 2018-10-01T20:53:10Z

@tsteur did you find out what the whole error was (ie, why it was getting a 400)?

tsteur · 2018-10-01T20:58:00Z

Nope not yet. I'll enable debugging and see what happens

tsteur · 2018-10-02T05:14:24Z

@diosmosis test should be fixed now

diosmosis · 2018-10-02T23:16:34Z

@tsteur there are some QueuedTracking tests still failing, doesn't look expected. Maybe something breaks tracking for queued tracking?

tsteur · 2018-10-03T02:01:10Z

@diosmosis should be fixed now

* Add possibility to manage and view Intranet websites matomo-org#7724 * more tweaks * ui tests * fix some tests * added missing name * remove intranet setting, added test for tracking * fix various tests * remove test * Update RequestProcessor.php * Update en.json * fix some tests * do not throw exception if site does not exist * seeing just now it is fine to trigger exception * debug error * log only certain requests * Update piwik.php * Update JsProxyTest.php * trying to fix tests * remove debug code * trying to fix tests

Add possibility to manage and view Intranet websites #7724

8eaa5e8

tsteur added Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Sep 24, 2018

tsteur added this to the 3.6.1 milestone Sep 24, 2018

tsteur commented Sep 24, 2018

View reviewed changes

tsteur added 4 commits September 24, 2018 16:58

more tweaks

bed583e

ui tests

fe4ce51

fix some tests

bcb6ed8

added missing name

cb9fe88

tsteur added 2 commits September 25, 2018 07:55

remove intranet setting, added test for tracking

75e4c40

fix various tests

a8d4782

tsteur added Needs Review PRs that need a code review and removed Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. labels Sep 24, 2018

remove test

60a8abc

diosmosis reviewed Sep 25, 2018

View reviewed changes

tsteur added 2 commits September 26, 2018 09:00

Update RequestProcessor.php

db5808a

Update en.json

a417bc6

diosmosis reviewed Sep 25, 2018

View reviewed changes

tsteur and others added 4 commits September 26, 2018 11:28

fix some tests

fb1bad6

do not throw exception if site does not exist

de6b2f9

seeing just now it is fine to trigger exception

2c70828

Merge branch '3.x-dev' into 7724

0cc932f

tsteur added 7 commits October 2, 2018 09:59

debug error

de4722f

Merge branch '7724' of github.com:matomo-org/piwik into 7724

72ca274

log only certain requests

d1aa59d

Update piwik.php

379485d

Update JsProxyTest.php

7a59c84

trying to fix tests

eeaccd6

remove debug code

dfee16c

tsteur force-pushed the 7724 branch from cb97c1b to dfee16c Compare October 2, 2018 05:38

trying to fix tests

2ab0b78

diosmosis merged commit 89d8479 into 3.x-dev Oct 7, 2018

diosmosis deleted the 7724 branch October 7, 2018 19:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add possibility to manage and view Intranet websites #13473

Add possibility to manage and view Intranet websites #13473

tsteur commented Sep 24, 2018

tsteur Sep 24, 2018

tsteur commented Sep 24, 2018

mattab commented Sep 24, 2018

mattab commented Sep 24, 2018

tsteur commented Sep 24, 2018

tsteur commented Sep 24, 2018

mattab commented Sep 24, 2018

diosmosis Sep 25, 2018

diosmosis Sep 25, 2018

tsteur commented Sep 25, 2018

diosmosis Sep 25, 2018

tsteur Sep 25, 2018

diosmosis Sep 25, 2018

diosmosis commented Sep 28, 2018

tsteur commented Sep 28, 2018

tsteur commented Sep 28, 2018

tsteur commented Oct 1, 2018

tsteur commented Oct 1, 2018

diosmosis commented Oct 1, 2018

tsteur commented Oct 1, 2018

tsteur commented Oct 2, 2018

diosmosis commented Oct 2, 2018

tsteur commented Oct 3, 2018

Add possibility to manage and view Intranet websites #13473

Add possibility to manage and view Intranet websites #13473

Conversation

tsteur commented Sep 24, 2018

tsteur Sep 24, 2018

Choose a reason for hiding this comment

tsteur commented Sep 24, 2018

mattab commented Sep 24, 2018

mattab commented Sep 24, 2018

tsteur commented Sep 24, 2018

tsteur commented Sep 24, 2018

mattab commented Sep 24, 2018

diosmosis Sep 25, 2018

Choose a reason for hiding this comment

diosmosis Sep 25, 2018

Choose a reason for hiding this comment

tsteur commented Sep 25, 2018

diosmosis Sep 25, 2018

Choose a reason for hiding this comment

tsteur Sep 25, 2018

Choose a reason for hiding this comment

diosmosis Sep 25, 2018

Choose a reason for hiding this comment

diosmosis commented Sep 28, 2018

tsteur commented Sep 28, 2018

tsteur commented Sep 28, 2018

tsteur commented Oct 1, 2018

tsteur commented Oct 1, 2018

diosmosis commented Oct 1, 2018

tsteur commented Oct 1, 2018

tsteur commented Oct 2, 2018

diosmosis commented Oct 2, 2018

tsteur commented Oct 3, 2018