Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Velluppillai <justin@innocraft.com>2021-12-10 01:00:53 +0300
committerGitHub <noreply@github.com>2021-12-10 01:00:53 +0300
commitcfb9a81f1bf761ee7ff9ef70749c46021c4471c1 (patch)
tree280e90031bf6e469bb24aaf070e610f3da88aefd
parentc77bd82060e0567819d20c745e2bd873ef5998f9 (diff)
Updated shell_exec recommended message (#18469)
* Updated shell_exec recommended message * Add _blank and noopener to external link * Rename shell_exec translation string key
-rw-r--r--plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php8
-rw-r--r--plugins/Installation/lang/en.json2
2 files changed, 7 insertions, 3 deletions
diff --git a/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php b/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
index 60c74c0460..123ac562b4 100644
--- a/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
+++ b/plugins/Diagnostics/Diagnostic/RecommendedFunctionsCheck.php
@@ -64,7 +64,7 @@ class RecommendedFunctionsCheck implements Diagnostic
private function getHelpMessage($function)
{
$messages = array(
- 'shell_exec' => 'Installation_SystemCheckFunctionHelp',
+ 'shell_exec' => 'Installation_SystemCheckShellExecHelp',
'set_time_limit' => 'Installation_SystemCheckTimeLimitHelp',
'mail' => 'Installation_SystemCheckMailHelp',
'parse_ini_file' => 'Installation_SystemCheckParseIniFileHelp',
@@ -72,6 +72,10 @@ class RecommendedFunctionsCheck implements Diagnostic
'gzopen' => 'Installation_SystemCheckZlibHelp',
);
- return $this->translator->translate($messages[$function]);
+ $translation_params = array(
+ 'shell_exec' => ["<a href='https://matomo.org/faq/troubleshooting/how-to-make-the-diagnostic-managing-processes-via-cli-to-display-ok/' rel='noopener' target='_blank'>", "</a>"]
+ );
+
+ return $this->translator->translate($messages[$function], $translation_params[$function] ?? []);
}
}
diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json
index ac71e1d6d2..0af056ea2c 100644
--- a/plugins/Installation/lang/en.json
+++ b/plugins/Installation/lang/en.json
@@ -88,7 +88,7 @@
"SystemCheckFileIntegrity": "File integrity",
"SystemCheckFilterHelp": "You need to configure and rebuild PHP with \"filter\" support enabled (don't use --disable-filter).",
"SystemCheckFunctions": "Required functions",
- "SystemCheckFunctionHelp": "You need to enable this built-in function.",
+ "SystemCheckShellExecHelp": "We recommend you enable this PHP built-in function. %1$sRead this to learn more.%2$s",
"SystemCheckGDFreeType": "GD > 2.x + Freetype (graphics)",
"SystemCheckGDHelp": "The sparklines (small graphs) and image graphs (in Matomo Mobile app and Email reports) will not work.",
"SystemCheckGlobHelp": "This built-in function has been disabled on your host. Matomo will attempt to emulate this function but may encounter further security restrictions. Functionality may be impacted.",