Pull in the external piwik.js manually

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.3.6 (2017-03-07)
+  - Pull in Piwik’s own piwik.js manually, again for CSP
+
 ## Version 0.3.5 (2017-03-07)
   - Move piwik code into its own js file to allow for CSP
 

public/assets/js/piwik.js

@@ -4,10 +4,5 @@ var _paq = _paq || [];
 // tracker methods like "setCustomDimension" should be called before "trackPageView"
 _paq.push(['trackPageView']);
 _paq.push(['enableLinkTracking']);
-(function() {
-    var u="https://analytics.jmb.lv/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', '1']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-})();
+_paq.push(['setTrackerUrl', 'https://analytics.jmb.lv/piwik.php']);
+_paq.push(['setSiteId', '1']);

resources/views/master.blade.php

@@ -47,7 +47,8 @@
 </footer>
 @if (config('app.piwik') === true)
 <!-- Piwik -->
-<script defer src="/assets/js/piwik.js"></script>
+<script defer src="https://analytics.jmb.lv/piwik.js"></script>
+<script src="/assets/js/piwik.js"></script>
 @endif
 </body>
 </html>