diff --git a/plugins/Diagnostics/Controller.php b/plugins/Diagnostics/Controller.php index 71272f22b33..e29b2a2508f 100644 --- a/plugins/Diagnostics/Controller.php +++ b/plugins/Diagnostics/Controller.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\Diagnostics; +use Piwik\Config; use Piwik\Piwik; use Piwik\Plugin\SettingsProvider; @@ -39,6 +40,7 @@ public function configfile() return $this->renderTemplate('configfile', array( 'allConfigValues' => $configValues, + 'configFilePath' => Config::getInstance()->getLocalPath(), )); } diff --git a/plugins/Diagnostics/templates/configfile.twig b/plugins/Diagnostics/templates/configfile.twig index ca3b60c9476..903bfb5a055 100644 --- a/plugins/Diagnostics/templates/configfile.twig +++ b/plugins/Diagnostics/templates/configfile.twig @@ -8,5 +8,6 @@
{% endblock %} diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index 815c0440afa..2558473d9e9 100644 --- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png +++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac6a33265dc49a6d9ee653fb4b374f239ade184c7b7dad058d202db5b793211f -size 413941 +oid sha256:97fc68d6543e00bd482ed6a4c6e415efd1ba07771293aaea4c31b0d4be30b48c +size 414186 diff --git a/plugins/Diagnostics/vue/dist/Diagnostics.umd.js b/plugins/Diagnostics/vue/dist/Diagnostics.umd.js index 580f3b49eba..07223751fcf 100644 --- a/plugins/Diagnostics/vue/dist/Diagnostics.umd.js +++ b/plugins/Diagnostics/vue/dist/Diagnostics.umd.js @@ -139,7 +139,7 @@ if (typeof window !== 'undefined') { // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"} var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf"); -// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--1-1!./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=73386260 +// CONCATENATED MODULE: ./node_modules/@vue/cli-plugin-babel/node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/@vue/cli-plugin-babel/node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/@vue/cli-service/node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--1-1!./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=6e46bb32 const _hoisted_1 = ["innerHTML"]; const _hoisted_2 = ["innerHTML"]; @@ -221,7 +221,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) { _: 1 }, 8, ["content-title"]); } -// CONCATENATED MODULE: ./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=73386260 +// CONCATENATED MODULE: ./plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue?vue&type=template&id=6e46bb32 // EXTERNAL MODULE: external "CoreHome" var external_CoreHome_ = __webpack_require__("19dc"); @@ -234,6 +234,10 @@ var external_CoreHome_ = __webpack_require__("19dc"); allConfigValues: { type: Object, required: true + }, + configFilePath: { + type: String, + required: true } }, components: { @@ -279,7 +283,7 @@ var external_CoreHome_ = __webpack_require__("19dc"); }, computed: { configFileIntro() { - return Object(external_CoreHome_["translate"])('Diagnostics_ConfigFileIntroduction', '"config/config.ini.php"'); + return Object(external_CoreHome_["translate"])('Diagnostics_ConfigFileIntroduction', `"${external_CoreHome_["Matomo"].helper.htmlEntities(this.configFilePath)}"`); } } })); diff --git a/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js b/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js index 2f55037cb19..d58c42c9c97 100644 --- a/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js +++ b/plugins/Diagnostics/vue/dist/Diagnostics.umd.min.js @@ -1,4 +1,4 @@ -(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Diagnostics"]=t(require("CoreHome"),require("vue")):e["Diagnostics"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var l=t[o]={i:o,l:!1,exports:{}};return e[o].call(l.exports,l,l.exports,n),l.l=!0,l.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var l in e)n.d(o,l,function(t){return e[t]}.bind(null,l));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Diagnostics/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ConfigFile",(function(){return k})),"undefined"!==typeof window){var o=window.document.currentScript,l=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);l&&(n.p=l[1])}var c=n("8bbf");const r=["innerHTML"],a=["innerHTML"],i=["href"],u=Object(c["createElementVNode"])("br",null,null,-1),s=Object(c["createElementVNode"])("p",null,null,-1),b={class:"diagnostics configfile"},d={colspan:"3"},f=["name"],j={class:"name"},p=["innerHTML"],O={class:"description"},m=["innerHTML"],g={key:0},h={key:0},y=["innerHTML"];function V(e,t,n,o,l,V){const v=Object(c["resolveComponent"])("Passthrough"),C=Object(c["resolveComponent"])("ContentBlock"),k=Object(c["resolveDirective"])("content-table");return Object(c["openBlock"])(),Object(c["createBlock"])(C,{"content-title":e.translate("Diagnostics_ConfigFileTitle"),feature:"true"},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("p",null,[Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(e.configFileIntro),style:{"margin-right":"3.5px"}},null,8,r),Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(e.translate("Diagnostics_HideUnchanged","","")),onClick:t[0]||(t[0]=t=>e.onHideUnchanged(t))},null,8,a)]),Object(c["createElementVNode"])("h3",null,Object(c["toDisplayString"])(e.translate("Diagnostics_Sections")),1),(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(e.allConfigValues,(e,t)=>(Object(c["openBlock"])(),Object(c["createBlock"])(v,{key:t},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("a",{href:"#"+t},Object(c["toDisplayString"])(t),9,i),u]),_:2},1024))),128)),s,Object(c["withDirectives"])((Object(c["openBlock"])(),Object(c["createElementBlock"])("table",b,[Object(c["createElementVNode"])("tbody",null,[(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(e.allConfigValues,(t,n)=>(Object(c["openBlock"])(),Object(c["createBlock"])(v,{key:n},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("tr",null,[Object(c["createElementVNode"])("td",d,[Object(c["createElementVNode"])("a",{name:n},null,8,f),Object(c["createElementVNode"])("h3",null,Object(c["toDisplayString"])(n),1)])]),(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(t,(t,n)=>Object(c["withDirectives"])((Object(c["openBlock"])(),Object(c["createElementBlock"])("tr",{key:n,class:Object(c["normalizeClass"])({"custom-value":t.isCustomValue})},[Object(c["createElementVNode"])("td",j,Object(c["toDisplayString"])(`${n}${null!==t.value&&(t.value instanceof Array||"object"===typeof t.value)?"[]":""}`),1),Object(c["createElementVNode"])("td",{class:"value",innerHTML:e.$sanitize(e.humanReadableValue(t.value))},null,8,p),Object(c["createElementVNode"])("td",O,[Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(t.description)},null,8,m),!t.isCustomValue&&null!==t.value||null===t.defaultValue?Object(c["createCommentVNode"])("",!0):(Object(c["openBlock"])(),Object(c["createElementBlock"])("span",g,[t.description?(Object(c["openBlock"])(),Object(c["createElementBlock"])("br",h)):Object(c["createCommentVNode"])("",!0),Object(c["createTextVNode"])(" "+Object(c["toDisplayString"])(e.translate("General_Default"))+": ",1),Object(c["createElementVNode"])("span",{class:"defaultValue",innerHTML:e.$sanitize(e.humanReadableValue(t.defaultValue))},null,8,y)]))])],2)),[[c["vShow"],t.isCustomValue||!e.hideGlobalConfigValues]])),128))]),_:2},1024))),128))])])),[[k]])]),_:1},8,["content-title"])}var v=n("19dc"),C=Object(c["defineComponent"])({props:{allConfigValues:{type:Object,required:!0}},components:{ContentBlock:v["ContentBlock"],Passthrough:v["Passthrough"]},directives:{ContentTable:v["ContentTable"]},data(){return{hideGlobalConfigValues:!1}},methods:{humanReadableValue(e){return!1===e?"false":!0===e?"true":null===e?"":""===e?"''":"object"===typeof e&&0===Object.keys(e).length?"[]":"object"===typeof e&&Object.keys(e).length>0?`
${JSON.stringify(e,null,4)}
`:v["Matomo"].helper.htmlEntities(""+e)},onHideUnchanged(e){"A"===e.target.tagName&&(this.hideGlobalConfigValues=!this.hideGlobalConfigValues)}},computed:{configFileIntro(){return Object(v["translate"])("Diagnostics_ConfigFileIntroduction",'"config/config.ini.php"')}}});C.render=V;var k=C; +(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t(require("CoreHome"),require("vue")):"function"===typeof define&&define.amd?define(["CoreHome"],t):"object"===typeof exports?exports["Diagnostics"]=t(require("CoreHome"),require("vue")):e["Diagnostics"]=t(e["CoreHome"],e["Vue"])})("undefined"!==typeof self?self:this,(function(e,t){return function(e){var t={};function n(o){if(t[o])return t[o].exports;var l=t[o]={i:o,l:!1,exports:{}};return e[o].call(l.exports,l,l.exports,n),l.l=!0,l.exports}return n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var l in e)n.d(o,l,function(t){return e[t]}.bind(null,l));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="plugins/Diagnostics/vue/dist/",n(n.s="fae3")}({"19dc":function(t,n){t.exports=e},"8bbf":function(e,n){e.exports=t},fae3:function(e,t,n){"use strict";if(n.r(t),n.d(t,"ConfigFile",(function(){return k})),"undefined"!==typeof window){var o=window.document.currentScript,l=o&&o.src.match(/(.+\/)[^/]+\.js(\?.*)?$/);l&&(n.p=l[1])}var c=n("8bbf");const r=["innerHTML"],a=["innerHTML"],i=["href"],u=Object(c["createElementVNode"])("br",null,null,-1),s=Object(c["createElementVNode"])("p",null,null,-1),b={class:"diagnostics configfile"},d={colspan:"3"},f=["name"],j={class:"name"},p=["innerHTML"],O={class:"description"},m=["innerHTML"],g={key:0},h={key:0},y=["innerHTML"];function V(e,t,n,o,l,V){const v=Object(c["resolveComponent"])("Passthrough"),C=Object(c["resolveComponent"])("ContentBlock"),k=Object(c["resolveDirective"])("content-table");return Object(c["openBlock"])(),Object(c["createBlock"])(C,{"content-title":e.translate("Diagnostics_ConfigFileTitle"),feature:"true"},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("p",null,[Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(e.configFileIntro),style:{"margin-right":"3.5px"}},null,8,r),Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(e.translate("Diagnostics_HideUnchanged","","")),onClick:t[0]||(t[0]=t=>e.onHideUnchanged(t))},null,8,a)]),Object(c["createElementVNode"])("h3",null,Object(c["toDisplayString"])(e.translate("Diagnostics_Sections")),1),(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(e.allConfigValues,(e,t)=>(Object(c["openBlock"])(),Object(c["createBlock"])(v,{key:t},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("a",{href:"#"+t},Object(c["toDisplayString"])(t),9,i),u]),_:2},1024))),128)),s,Object(c["withDirectives"])((Object(c["openBlock"])(),Object(c["createElementBlock"])("table",b,[Object(c["createElementVNode"])("tbody",null,[(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(e.allConfigValues,(t,n)=>(Object(c["openBlock"])(),Object(c["createBlock"])(v,{key:n},{default:Object(c["withCtx"])(()=>[Object(c["createElementVNode"])("tr",null,[Object(c["createElementVNode"])("td",d,[Object(c["createElementVNode"])("a",{name:n},null,8,f),Object(c["createElementVNode"])("h3",null,Object(c["toDisplayString"])(n),1)])]),(Object(c["openBlock"])(!0),Object(c["createElementBlock"])(c["Fragment"],null,Object(c["renderList"])(t,(t,n)=>Object(c["withDirectives"])((Object(c["openBlock"])(),Object(c["createElementBlock"])("tr",{key:n,class:Object(c["normalizeClass"])({"custom-value":t.isCustomValue})},[Object(c["createElementVNode"])("td",j,Object(c["toDisplayString"])(`${n}${null!==t.value&&(t.value instanceof Array||"object"===typeof t.value)?"[]":""}`),1),Object(c["createElementVNode"])("td",{class:"value",innerHTML:e.$sanitize(e.humanReadableValue(t.value))},null,8,p),Object(c["createElementVNode"])("td",O,[Object(c["createElementVNode"])("span",{innerHTML:e.$sanitize(t.description)},null,8,m),!t.isCustomValue&&null!==t.value||null===t.defaultValue?Object(c["createCommentVNode"])("",!0):(Object(c["openBlock"])(),Object(c["createElementBlock"])("span",g,[t.description?(Object(c["openBlock"])(),Object(c["createElementBlock"])("br",h)):Object(c["createCommentVNode"])("",!0),Object(c["createTextVNode"])(" "+Object(c["toDisplayString"])(e.translate("General_Default"))+": ",1),Object(c["createElementVNode"])("span",{class:"defaultValue",innerHTML:e.$sanitize(e.humanReadableValue(t.defaultValue))},null,8,y)]))])],2)),[[c["vShow"],t.isCustomValue||!e.hideGlobalConfigValues]])),128))]),_:2},1024))),128))])])),[[k]])]),_:1},8,["content-title"])}var v=n("19dc"),C=Object(c["defineComponent"])({props:{allConfigValues:{type:Object,required:!0},configFilePath:{type:String,required:!0}},components:{ContentBlock:v["ContentBlock"],Passthrough:v["Passthrough"]},directives:{ContentTable:v["ContentTable"]},data(){return{hideGlobalConfigValues:!1}},methods:{humanReadableValue(e){return!1===e?"false":!0===e?"true":null===e?"":""===e?"''":"object"===typeof e&&0===Object.keys(e).length?"[]":"object"===typeof e&&Object.keys(e).length>0?`
${JSON.stringify(e,null,4)}
`:v["Matomo"].helper.htmlEntities(""+e)},onHideUnchanged(e){"A"===e.target.tagName&&(this.hideGlobalConfigValues=!this.hideGlobalConfigValues)}},computed:{configFileIntro(){return Object(v["translate"])("Diagnostics_ConfigFileIntroduction",`"${v["Matomo"].helper.htmlEntities(this.configFilePath)}"`)}}});C.render=V;var k=C; /*! * Matomo - free/libre analytics platform * diff --git a/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue b/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue index cb03ec7369e..a5ec6885882 100644 --- a/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue +++ b/plugins/Diagnostics/vue/src/ConfigFile/ConfigFile.vue @@ -90,6 +90,10 @@ export default defineComponent({ type: Object, required: true, }, + configFilePath: { + type: String, + required: true, + }, }, components: { ContentBlock, @@ -147,7 +151,7 @@ export default defineComponent({ configFileIntro() { return translate( 'Diagnostics_ConfigFileIntroduction', - '"config/config.ini.php"', + `"${Matomo.helper.htmlEntities(this.configFilePath)}"`, ); }, }, diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php index 8de134acf89..de50db0259b 100644 --- a/tests/PHPUnit/proxy/includes.php +++ b/tests/PHPUnit/proxy/includes.php @@ -1,8 +1,7 @@ realpath(PIWIK_INCLUDE_PATH . 'tests/resources/custompluginsdir'), + 'pluginsPathAbsolute' => realpath(PIWIK_INCLUDE_PATH . '/tests/resources/custompluginsdir'), 'webrootDirRelativeToMatomo' => '../../resources/custompluginsdir' ), ); diff --git a/tests/PHPUnit/proxy/nodispatchnotinstalled.php b/tests/PHPUnit/proxy/nodispatchnotinstalled.php index f4fabeecf1b..96e7f0748db 100644 --- a/tests/PHPUnit/proxy/nodispatchnotinstalled.php +++ b/tests/PHPUnit/proxy/nodispatchnotinstalled.php @@ -12,9 +12,9 @@ require realpath(dirname(__FILE__)) . "/includes.php"; $testEnvironment = new TestingEnvironmentVariables(); -$testEnvironment->configFileLocal = PIWIK_INCLUDE_PATH . "tmp/test.config.ini.php"; +$testEnvironment->configFileLocal = PIWIK_INCLUDE_PATH . "/tmp/test.config.ini.php"; $testEnvironment->save(); Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator($testEnvironment)); -include PIWIK_INCLUDE_PATH . '/index.php'; \ No newline at end of file +include PIWIK_INCLUDE_PATH . '/index.php'; diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 53f2a37bc2b..62c1ed0e91c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2df4ee090bcac9c04e84ce616f1bbe14ad28417062a1823bc541684a67a8c5b6 -size 5320144 +oid sha256:d6e0ed9aedaac75305855f991b73dfad6e0f03431cf5bf8a5ed2de6a8211672d +size 5320529 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png index 75e245b25a6..8b9ba18cf6a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6589af033f8e5e14808e4eaa1df1855d1f70ec8fa16c898f3bef7cfe8115901d -size 68102 +oid sha256:2391f809b25272bc8f9b310f858b4e04a1fb511092064da8b2f4c872df796d2c +size 68321