build v0.3.2v0.3.2

8 files changed, 19 insertions, 18 deletions

diff --git a/build/appinfo/app.php b/build/appinfo/app.php
index 7c1346a..787adf8 100644
--- a/build/appinfo/app.php
+++ b/build/appinfo/app.php
@@ -12,13 +12,14 @@
 
 OCP\App::registerAdmin ( 'piwik', 'settings-admin' );
 
-if(class_exists('\\OCP\\AppFramework\\Http\\ContentSecurityPolicy')) {
-   $piwik = json_decode(OCP\Config::getAppValue('piwik', 'piwik'));
+$piwik = json_decode(OCP\Config::getAppValue('piwik', 'piwik'));
+
+if(class_exists('\\OCP\\AppFramework\\Http\\ContentSecurityPolicy') && $piwik !== null) {
    $url = parse_url($piwik->url, PHP_URL_HOST);
 
    $policy = new OCP\AppFramework\Http\ContentSecurityPolicy ();
-   $policy->addAllowedScriptDomain('\'self\'');
-   $policy->addAllowedImageDomain('\'self\'');
+   $policy->addAllowedScriptDomain('\'self\' ');
+   $policy->addAllowedImageDomain('\'self\' ');
 
    if ($url !== false && array_key_exists('HTTP_HOST', $_SERVER) && $_SERVER['HTTP_HOST'] !== $url) {
       $policy->addAllowedScriptDomain($url);
diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
index c0365e9..a5c7626 100644
--- a/build/appinfo/info.xml
+++ b/build/appinfo/info.xml
@@ -4,18 +4,18 @@
 	<name>Piwik Tracking</name>
 	<summary>Track users with piwik</summary>
 	<description>Track users with piwik</description>
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<licence>agpl</licence>
 	<author>Klaus Herberth</author>
 	<category>tools</category>
 
-	<website>http://sualko.github.io/owncloud_piwik/</website>
-	<bugs>https://github.com/sualko/owncloud_piwik/issues</bugs>
-	<repository type="git">https://github.com/sualko/owncloud_piwik.git</repository>
+	<website>http://sualko.github.io/cloud_piwik/</website>
+	<bugs>https://github.com/sualko/cloud_piwik/issues</bugs>
+	<repository type="git">https://github.com/sualko/cloud_piwik.git</repository>
 
 	<dependencies>
-		<owncloud min-version="8.0" max-version="10"/>
-		<nextcloud min-version="8.0" max-version="12"/>
+		<owncloud min-version="9.0" max-version="10"/>
+		<nextcloud min-version="10.0" max-version="13"/>
 	</dependencies>
 
 	<ocsid>171304</ocsid>
diff --git a/build/appinfo/version b/build/appinfo/version
index 9e11b32..d15723f 100644
--- a/build/appinfo/version
+++ b/build/appinfo/version
@@ -1 +1 @@
-0.3.1
+0.3.2
diff --git a/build/js/settings-admin.js b/build/js/settings-admin.js
index 19d081b..8dae0e5 100644
--- a/build/js/settings-admin.js
+++ b/build/js/settings-admin.js
@@ -1,5 +1,5 @@
 /*!
- * owncloud_piwik v0.3.1 - 2017-05-30
+ * owncloud_piwik v0.3.2 - 2017-11-29
  * 
  * Copyright (c) 2017 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
@@ -7,7 +7,7 @@
  * Please see https://github.com/sualko/owncloud_piwik
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.3.1
+ * @version 0.3.2
  * @license MIT
  */
 
diff --git a/build/js/settings-admin.min.js.map b/build/js/settings-admin.min.js.map
index fce3ab1..6b1c454 100644
--- a/build/js/settings-admin.min.js.map
+++ b/build/js/settings-admin.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../js/settings-admin.js"],"names":["$","setValue","data","JSON","parse","err","form","each","name","val","el","find","attr","prop","OCP","AppConfig","getValue","success","result","text","OC","window","location","host","change","formData","serializeArray","index","obj","value","url","match","stringify"],"mappings":"AAEAA,EAAE,WACC,QAASC,UAASC,MACf,GAAIA,KACD,IACGA,KAAOC,KAAKC,MAAMF,MACnB,MAAOG,MAEZH,KAAOA,QAEP,IAAII,MAAON,EAAE,sBAEbA,GAAEO,KAAKL,KAAM,SAASM,KAAMC,KACzB,GAAIC,IAAKJ,KAAKK,KAAK,SAAWH,KAAO,IAEb,cAApBE,GAAGE,KAAK,QACTF,GAAGG,KAAK,UAAmB,QAARJ,KAAyB,OAARA,KAEpCC,GAAGD,IAAIA,OAKG,mBAARK,KACRA,IAAIC,UAAUC,SAAS,QAAS,YAC7BC,QAAS,SAASC,QACfjB,SAASD,EAAEkB,QAAQP,KAAK,aAAaQ,WAI3CC,GAAGL,UAAUC,SAAS,QAAS,WAAaf,UAG/CD,EAAE,aAAaY,KAAK,cAAe,UAAYS,OAAOC,SAASC,KAAO,WAEtEvB,EAAE,wBAAwBwB,OAAO,WAC9B,GAAIC,UAAWzB,EAAE,uBAAuB0B,iBACpCxB,OAEJF,GAAEO,KAAKkB,SAAU,SAASE,MAAOC,KAC9B1B,KAAK0B,IAAIpB,MAAQoB,IAAIC,QAGnB3B,KAAK4B,IAAIC,MAAM,SACjB7B,KAAK4B,KAAO,KAGI,mBAARhB,KACRA,IAAIC,UAAUd,SAAS,QAAS,QAASE,KAAK6B,UAAU9B,OAExDkB,GAAGL,UAAUd,SAAS,QAAS,QAASE,KAAK6B,UAAU9B","file":"settings-admin.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../js/settings-admin.js"],"names":["$","setValue","data","JSON","parse","err","form","each","name","val","el","find","attr","prop","OCP","AppConfig","getValue","success","result","text","OC","window","location","host","change","formData","serializeArray","index","obj","value","url","match","stringify"],"mappings":"AAEAA,EAAE,WACC,SAASC,SAASC,MACf,GAAIA,KACD,IACGA,KAAOC,KAAKC,MAAMF,MACnB,MAAOG,MAEZH,KAAOA,SAEP,IAAII,KAAON,EAAE,uBAEbA,EAAEO,KAAKL,KAAM,SAASM,KAAMC,KACzB,IAAIC,GAAKJ,KAAKK,KAAK,SAAWH,KAAO,KAEb,aAApBE,GAAGE,KAAK,QACTF,GAAGG,KAAK,UAAmB,QAARJ,KAAyB,OAARA,KAEpCC,GAAGD,IAAIA,OAKG,oBAARK,IACRA,IAAIC,UAAUC,SAAS,QAAS,YAC7BC,QAAS,SAASC,QACfjB,SAASD,EAAEkB,QAAQP,KAAK,aAAaQ,WAI3CC,GAAGL,UAAUC,SAAS,QAAS,WAAaf,UAG/CD,EAAE,aAAaY,KAAK,cAAe,UAAYS,OAAOC,SAASC,KAAO,WAEtEvB,EAAE,wBAAwBwB,OAAO,WAC9B,IAAIC,SAAWzB,EAAE,uBAAuB0B,iBACpCxB,QAEJF,EAAEO,KAAKkB,SAAU,SAASE,MAAOC,KAC9B1B,KAAK0B,IAAIpB,MAAQoB,IAAIC,QAGnB3B,KAAK4B,IAAIC,MAAM,SACjB7B,KAAK4B,KAAO,KAGI,oBAARhB,IACRA,IAAIC,UAAUd,SAAS,QAAS,QAASE,KAAK6B,UAAU9B,OAExDkB,GAAGL,UAAUd,SAAS,QAAS,QAASE,KAAK6B,UAAU9B","file":"settings-admin.min.js"}
\ No newline at end of file
diff --git a/build/js/track.js b/build/js/track.js
index 72915b0..c9745d5 100644
--- a/build/js/track.js
+++ b/build/js/track.js
@@ -1,5 +1,5 @@
 /*!
- * owncloud_piwik v0.3.1 - 2017-05-30
+ * owncloud_piwik v0.3.2 - 2017-11-29
  * 
  * Copyright (c) 2017 Klaus Herberth <klaus@jsxc.org> <br>
  * Released under the MIT license
@@ -7,7 +7,7 @@
  * Please see https://github.com/sualko/owncloud_piwik
  * 
  * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.3.1
+ * @version 0.3.2
  * @license MIT
  */
 
diff --git a/build/js/track.min.js b/build/js/track.min.js
index 1da2cdb..1e8aefc 100644
--- a/build/js/track.min.js
+++ b/build/js/track.min.js
@@ -1,2 +1,2 @@
-var _paq=_paq||[];!function(){"use strict";function track(options){var app=null,path=window.location.pathname,pathparts=path.match(/index\.php\/apps\/([a-z0-9]+)\/?/i)||path.match(/index\.php\/([a-z0-9]+)(\/([a-z0-9]+))?/i)||[];if(pathparts.length>=2){if(app=pathparts[1],"s"===app){app="share";var sharevalue=$('input[name="filename"]').val();sharevalue?(sharevalue=pathparts[3]+" ("+sharevalue+")",_paq.push(["setCustomVariable","3","ShareNodes",sharevalue,"page"])):sharevalue=pathparts[3],_paq.push(["setCustomVariable","2","Shares",pathparts[3],"page"])}_paq.push(["setCustomVariable","1","App",app,"page"])}if(OC&&OC.currentUser&&_paq.push(["setUserId",OC.currentUser]),"on"===options.trackDir&&$("#app-content").delegate(">div","afterChangeDirectory",function(){_paq.push(["setDocumentTitle",document.title]),_paq.push(["setCustomUrl",window.location.href]),_paq.push(["trackPageView"])}),_paq.push(["setTrackerUrl",options.url+"piwik.php"]),_paq.push(["setSiteId",options.siteId]),"files"===app&&"on"===options.trackDir||_paq.push(["trackPageView"]),"undefined"==typeof Piwik){var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.type="text/javascript",g.async=!0,g.defer=!0,g.src=options.url+"piwik.js",s.parentNode.insertBefore(g,s)}}var piwik="undefined"!=typeof localStorage?localStorage.getItem("piwik"):null;piwik&&(piwik.validUntil||0)>(new Date).getTime()/1e3&&!oc_debug?track(piwik):$.ajax({url:OC.filePath("piwik","ajax","getPiwikSettings.php")}).done(function(data){data=data||{},piwik=JSON.parse(data.data)||{},piwik.siteId&&piwik.url&&(piwik.validUntil=(new Date).getTime()+1e3*piwik.validity,localStorage.setItem("piwik",piwik),track(piwik))})}();
+var _paq=_paq||[];!function(){"use strict";function track(options){var app=null,path=window.location.pathname,pathparts=path.match(/index\.php\/apps\/([a-z0-9]+)\/?/i)||path.match(/index\.php\/([a-z0-9]+)(\/([a-z0-9]+))?/i)||[];if(pathparts.length>=2){if("s"===(app=pathparts[1])){app="share";var sharevalue=$('input[name="filename"]').val();sharevalue?(sharevalue=pathparts[3]+" ("+sharevalue+")",_paq.push(["setCustomVariable","3","ShareNodes",sharevalue,"page"])):sharevalue=pathparts[3],_paq.push(["setCustomVariable","2","Shares",pathparts[3],"page"])}_paq.push(["setCustomVariable","1","App",app,"page"])}if(OC&&OC.currentUser&&_paq.push(["setUserId",OC.currentUser]),"on"===options.trackDir&&$("#app-content").delegate(">div","afterChangeDirectory",function(){_paq.push(["setDocumentTitle",document.title]),_paq.push(["setCustomUrl",window.location.href]),_paq.push(["trackPageView"])}),_paq.push(["setTrackerUrl",options.url+"piwik.php"]),_paq.push(["setSiteId",options.siteId]),"files"===app&&"on"===options.trackDir||_paq.push(["trackPageView"]),"undefined"==typeof Piwik){var d=document,g=d.createElement("script"),s=d.getElementsByTagName("script")[0];g.type="text/javascript",g.async=!0,g.defer=!0,g.src=options.url+"piwik.js",s.parentNode.insertBefore(g,s)}}var piwik="undefined"!=typeof localStorage?localStorage.getItem("piwik"):null;piwik&&(piwik.validUntil||0)>(new Date).getTime()/1e3&&!oc_debug?track(piwik):$.ajax({url:OC.filePath("piwik","ajax","getPiwikSettings.php")}).done(function(data){data=data||{},(piwik=JSON.parse(data.data)||{}).siteId&&piwik.url&&(piwik.validUntil=(new Date).getTime()+1e3*piwik.validity,localStorage.setItem("piwik",piwik),track(piwik))})}();
 //# sourceMappingURL=track.min.js.map
\ No newline at end of file
diff --git a/build/js/track.min.js.map b/build/js/track.min.js.map
index 4611e89..5a67d5e 100644
--- a/build/js/track.min.js.map
+++ b/build/js/track.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../js/track.js"],"names":["_paq","track","options","app","path","window","location","pathname","pathparts","match","length","sharevalue","$","val","push","OC","currentUser","trackDir","delegate","document","title","href","url","siteId","Piwik","d","g","createElement","s","getElementsByTagName","type","async","defer","src","parentNode","insertBefore","piwik","localStorage","getItem","validUntil","Date","getTime","oc_debug","ajax","filePath","done","data","JSON","parse","validity","setItem"],"mappings":"AAEA,GAAIA,MAAOA,UAEV,WACE,YA0BA,SAASC,OAAMC,SACZ,GAAIC,KAAM,KACNC,KAAOC,OAAOC,SAASC,SACvBC,UAAYJ,KAAKK,MAAM,sCAAwCL,KAAKK,MAAM,+CAE9E,IAAID,UAAUE,QAAU,EAAG,CAGxB,GAFAP,IAAMK,UAAU,GAEJ,MAARL,IAAa,CAEdA,IAAM,OAEN,IAAIQ,YAAaC,EAAE,0BAA0BC,KAEzCF,aACDA,WAAaH,UAAU,GAAK,KAAOG,WAAa,IAGhDX,KAAKc,MAAM,oBAAqB,IAAK,aAAcH,WAAY,UAE/DA,WAAaH,UAAU,GAI1BR,KAAKc,MAAM,oBAAqB,IAAK,SAAUN,UAAU,GAAI,SAIhER,KAAKc,MAAM,oBAAqB,IAAK,MAAOX,IAAK,SA4BpD,GAzBIY,IAAMA,GAAGC,aAEVhB,KAAKc,MAAM,YAAaC,GAAGC,cAGL,OAArBd,QAAQe,UAGTL,EAAE,gBAAgBM,SAAS,OAAQ,uBAAwB,WAExDlB,KAAKc,MAAM,mBAAoBK,SAASC,QACxCpB,KAAKc,MAAM,eAAgBT,OAAOC,SAASe,OAC3CrB,KAAKc,MAAM,oBAKjBd,KAAKc,MAAM,gBAAiBZ,QAAQoB,IAAM,cAC1CtB,KAAKc,MAAM,YAAaZ,QAAQqB,SAEpB,UAARpB,KAAwC,OAArBD,QAAQe,UAE5BjB,KAAKc,MAAM,kBAGO,mBAAVU,OAAuB,CAE/B,GAAIC,GAAIN,SACLO,EAAID,EAAEE,cAAc,UACpBC,EAAIH,EAAEI,qBAAqB,UAAU,EACxCH,GAAEI,KAAO,kBACTJ,EAAEK,OAAQ,EACVL,EAAEM,OAAQ,EACVN,EAAEO,IAAM/B,QAAQoB,IAAM,WACtBM,EAAEM,WAAWC,aAAaT,EAAGE,IAzFnC,GAAIQ,OAAiC,mBAAjBC,cAAgCA,aAAaC,QAAQ,SAAW,IAEhFF,SAAUA,MAAMG,YAAc,IAAK,GAAKC,OAAQC,UAAY,MAASC,SAEtEzC,MAAMmC,OAGNxB,EAAE+B,MACIrB,IAAKP,GAAG6B,SAAS,QAAS,OAAQ,0BAEpCC,KAAK,SAASC,MACZA,KAAOA,SACPV,MAAQW,KAAKC,MAAMF,KAAKA,UAEpBV,MAAMb,QAAUa,MAAMd,MACvBc,MAAMG,YAAa,GAAKC,OAAQC,UAA8B,IAAjBL,MAAMa,SAEnDZ,aAAaa,QAAQ,QAASd,OAE9BnC,MAAMmC","file":"track.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../../js/track.js"],"names":["_paq","track","options","app","path","window","location","pathname","pathparts","match","length","sharevalue","$","val","push","OC","currentUser","trackDir","delegate","document","title","href","url","siteId","Piwik","d","g","createElement","s","getElementsByTagName","type","async","defer","src","parentNode","insertBefore","piwik","localStorage","getItem","validUntil","Date","getTime","oc_debug","ajax","filePath","done","data","JSON","parse","validity","setItem"],"mappings":"AAEA,IAAIA,KAAOA,UAEV,WACE,aA0BA,SAASC,MAAMC,SACZ,IAAIC,IAAM,KACNC,KAAOC,OAAOC,SAASC,SACvBC,UAAYJ,KAAKK,MAAM,sCAAwCL,KAAKK,MAAM,gDAE9E,GAAID,UAAUE,QAAU,EAAG,CAGxB,GAAY,OAFZP,IAAMK,UAAU,IAEC,CAEdL,IAAM,QAEN,IAAIQ,WAAaC,EAAE,0BAA0BC,MAEzCF,YACDA,WAAaH,UAAU,GAAK,KAAOG,WAAa,IAGhDX,KAAKc,MAAM,oBAAqB,IAAK,aAAcH,WAAY,UAE/DA,WAAaH,UAAU,GAI1BR,KAAKc,MAAM,oBAAqB,IAAK,SAAUN,UAAU,GAAI,SAIhER,KAAKc,MAAM,oBAAqB,IAAK,MAAOX,IAAK,SA4BpD,GAzBIY,IAAMA,GAAGC,aAEVhB,KAAKc,MAAM,YAAaC,GAAGC,cAGL,OAArBd,QAAQe,UAGTL,EAAE,gBAAgBM,SAAS,OAAQ,uBAAwB,WAExDlB,KAAKc,MAAM,mBAAoBK,SAASC,QACxCpB,KAAKc,MAAM,eAAgBT,OAAOC,SAASe,OAC3CrB,KAAKc,MAAM,oBAKjBd,KAAKc,MAAM,gBAAiBZ,QAAQoB,IAAM,cAC1CtB,KAAKc,MAAM,YAAaZ,QAAQqB,SAEpB,UAARpB,KAAwC,OAArBD,QAAQe,UAE5BjB,KAAKc,MAAM,kBAGO,oBAAVU,MAAuB,CAE/B,IAAIC,EAAIN,SACLO,EAAID,EAAEE,cAAc,UACpBC,EAAIH,EAAEI,qBAAqB,UAAU,GACxCH,EAAEI,KAAO,kBACTJ,EAAEK,OAAQ,EACVL,EAAEM,OAAQ,EACVN,EAAEO,IAAM/B,QAAQoB,IAAM,WACtBM,EAAEM,WAAWC,aAAaT,EAAGE,IAzFnC,IAAIQ,MAAiC,oBAAjBC,aAAgCA,aAAaC,QAAQ,SAAW,KAEhFF,QAAUA,MAAMG,YAAc,IAAK,IAAKC,MAAQC,UAAY,MAASC,SAEtEzC,MAAMmC,OAGNxB,EAAE+B,MACIrB,IAAKP,GAAG6B,SAAS,QAAS,OAAQ,0BAEpCC,KAAK,SAASC,MACZA,KAAOA,UACPV,MAAQW,KAAKC,MAAMF,KAAKA,WAEdvB,QAAUa,MAAMd,MACvBc,MAAMG,YAAa,IAAKC,MAAQC,UAA8B,IAAjBL,MAAMa,SAEnDZ,aAAaa,QAAQ,QAASd,OAE9BnC,MAAMmC,UAtBrB","file":"track.min.js"}
\ No newline at end of file