Merge pull request jenkinsci#3 from ilja-radusch/fix-senduserid-bug-and-configure-scripts

Author: atai

src/main/java/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator.java

@@ -13,6 +13,8 @@ public class MatomoPageDecorator extends PageDecorator {
     private String matomoSiteID;
     private String matomoServer;
     private String matomoPath;
+    private String matomoPhp;
+    private String matomoJs;
     private boolean matomoUseHttps = true;
     private boolean matomoSendUserID = false;
 
@@ -25,12 +27,16 @@ public MatomoPageDecorator() {
     public MatomoPageDecorator(String matomoSiteID,
                                String matomoServer,
                                String matomoPath,
+                               String matomoPhp,
+                               String matomoJs,
                                boolean matomoUseHttps,
                                boolean matomoSendUserID) {
         this();
         setMatomoSiteID(matomoSiteID);
         setMatomoServer(matomoServer);
         setMatomoPath(matomoPath);
+        setMatomoPhp(matomoPhp);
+        setMatomoJs(matomoJs);
         setMatomoUseHttps(matomoUseHttps);
         setMatomoSendUserID(matomoSendUserID);
     }
@@ -67,6 +73,22 @@ public void setMatomoPath(String matomoPath) {
         this.matomoPath = matomoPath;
     }
 
+    public String getMatomoPhp() {
+        return matomoPhp;
+    }
+
+    public void setMatomoPhp(String matomoPhp) {
+        this.matomoPhp = matomoPhp;
+    }
+
+    public String getMatomoJs() {
+        return matomoJs;
+    }
+
+    public void setMatomoJs(String matomoJs) {
+        this.matomoJs = matomoJs;
+    }
+
     public boolean isMatomoUseHttps() {
         return matomoUseHttps;
     }

src/main/resources/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator/footer.jelly

@@ -5,27 +5,34 @@
             <!-- Matomo -->
             <script>
                 var _paq = window._paq = window._paq || [];
+                _paq.push(["setDomains", [
+                    <j:forEach var="d" items="${instance.domains}">
+                        "${d}"<j:if test="${!d_last}">,</j:if>
+                    </j:forEach>
+                ] ]);
                 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
                 _paq.push(['trackPageView']);
                 _paq.push(['enableLinkTracking']);
                 var d = document;
-                if ("${it.matomoSendUserID}") {
-                    var userID, userIDNode, Nodes = d.getElementsByClassName('hidden-xs hidden-sm');
-                    if (Nodes !== undefined) {
-                        _paq.push(['setUserId', Nodes[0].textContent]);
-                    }
+                if (${it.matomoSendUserID}) {
+                    _paq.push(['setUserId', "${app.authentication.name}".trim()]);
+                } else {
+                    _paq.push(["setDoNotTrack", true]);
                 }
                 (function () {
                     var u = "${it.protocolString}${it.matomoServer}${it.matomoPath}";
-                    _paq.push(['setTrackerUrl', u + 'matomo.php']);
+                    var matomoPhp = "${it.matomoPhp ?: 'matomo.php'}";
+                    var matomoJs  = "${it.matomoJs  ?: 'matomo.js'}";
+
+                    _paq.push(['setTrackerUrl', u + matomoPhp]);
                     _paq.push(['setSiteId', ${it.matomoSiteID}]);
                     var g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
                     g.async = true;
-                    g.src = u + 'matomo.js';
+                    g.src = u + matomoJs;
                     s.parentNode.insertBefore(g, s);
                 })();
             </script>
             <!-- End Matomo Code -->
         </j:when>
     </j:choose>
-</j:jelly>
+</j:jelly>

src/main/resources/io/jenkins/plugins/matomoanalytics/MatomoPageDecorator/global.jelly

@@ -16,5 +16,14 @@
         <f:entry title="${%Use https}" field="matomoUseHttps" help="/plugin/matomo-analytics/matomousehttps.html">
             <f:checkbox/>
         </f:entry>
+        <!-- Advanced section for PHP & JS -->
+        <f:advanced>
+            <f:entry title="${%Matomo PHP file}"  help="/plugin/matomo-analytics/matomophp.html">
+                <f:textbox field="matomoPhp" default="matomo.php"/>
+            </f:entry>
+            <f:entry title="${%Matomo JS file}"  help="/plugin/matomo-analytics/matomojs.html">
+                <f:textbox field="matomoJs" default="matomo.js"/>
+            </f:entry>
+        </f:advanced>
     </f:section>
-</j:jelly>
+</j:jelly>

src/main/webapp/matomojs.html

@@ -0,0 +1,3 @@
+<div>
+    The JavaScript file of the Matomo instance. Example: matomo.js
+</div>

src/main/webapp/matomophp.html

@@ -0,0 +1,3 @@
+<div>
+    The PHP file of the Matomo instance. Example: matomo.php
+</div>