build v0.5.1

appinfo/info.xml

@@ -4,7 +4,7 @@
 	<name>Piwik/Matomo Tracking</name>
 	<summary>Track users with Piwik/Matomo</summary>
 	<description>Track users with Piwik/Matomo</description>
-	<version>0.5.0</version>
+	<version>0.5.1</version>
 	<licence>agpl</licence>
 	<author>Klaus Herberth</author>
 	<category>tools</category>

build/appinfo/app.php

@@ -10,7 +10,11 @@
         ], ''
     );
 
-    $url = parse_url($url, PHP_URL_HOST);
+    $parseurl = parse_url($url);
+    $url = $parseurl['host'];
+    if (isset($parseurl['port'])) {
+      $url .= ':' . (string) $parseurl['port'];
+    }
     $policy = new OCP\AppFramework\Http\ContentSecurityPolicy();
 
     if ($url !== false && array_key_exists('HTTP_HOST', $_SERVER)

build/appinfo/info.xml

@@ -4,7 +4,7 @@
 	<name>Piwik/Matomo Tracking</name>
 	<summary>Track users with Piwik/Matomo</summary>
 	<description>Track users with Piwik/Matomo</description>
-	<version>0.5.0</version>
+	<version>0.5.1</version>
 	<licence>agpl</licence>
 	<author>Klaus Herberth</author>
 	<category>tools</category>

build/js/settings/admin.js

@@ -1,6 +1,8 @@
 /* global OCP, OC */
 
 $(function() {
+   $('#piwikAdblockerWarning').hide();
+
    function showRequestResult(element, result) {
       if (element.attr('type') === 'checkbox') {
          element = $('label[for="' + element.attr('id') + '"]');

build/js/track.js

@@ -1,13 +1,13 @@
 /*!
- * cloud_piwik v0.5.0 - 2018-10-29
+ * cloud_piwik v0.5.1 - 2019-03-04
  * 
- * Copyright (c) 2018 Klaus Herberth <[email protected]> <br>
+ * Copyright (c) 2019 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see https://github.com/sualko/cloud_piwik
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 0.5.0
+ * @version 0.5.1
  * @license MIT
  */
 

build/lib/Controller/JavaScriptController.php

@@ -47,6 +47,6 @@ public function tracking()
         $script = file_get_contents(__DIR__ . '/../../js/track.js');
         $script = str_replace('%OPTIONS%', json_encode($options), $script);
 
-        return new DataDownloadResponse($script, 'script', 'text/javascript');
+        return new DataDownloadResponse($script, 'tracking.js', 'text/javascript');
     }
 }

build/templates/settings/admin.php

@@ -6,6 +6,7 @@
 <div id="piwikSettings" class="section">
 	<h2>Piwik/Matomo Tracking</h2>
 	<p class="settings-hint">If you have no Piwik/Matomo instance, go to <a href="https://matomo.org" target="_blank">matomo.org</a> for further instructions.</p>
+	<p id="piwikAdblockerWarning" style="border-left:2px red solid;padding-left:1em">It seems that you use a content blocker plugin in your browser to stop trackers like Matomo. Unfortunately, your plugin also breaks this settings form, so you might want to disable the content blocker for your NextCloud.</p>
 
 	<form>
 		<table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud_piwik",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Track owncloud/nextcloud users with piwik",
   "repository": {
     "type": "git",