diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index 7399a218e9c..d171fcaa2ec 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -42,11 +42,11 @@ print '
| '.$langs->trans("Parameter").' | '.$lan
print "\n";
// Recupere l'OS au sens PHP
-print " |
| ".$langs->trans("PHP_OS")." | ".PHP_OS." |
\n";
+print '| '.$langs->trans("PHP_OS")." | ".PHP_OS." |
\n";
// Recupere la version de l'OS
$osversion=version_os();
-print "| ".$langs->trans("Version")." | ".$osversion." |
\n";
+print '| '.$langs->trans("Version")." | ".$osversion." |
\n";
print '';
// End of page
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index cd636d02e9c..0356ecc8b23 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1569,7 +1569,7 @@ function dol_print_reduction($reduction, $langs)
*/
function version_os($option = '')
{
- if ($option) $osversion = php_uname($option);
+ if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');
else $osversion = php_uname();
return $osversion;
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b17bb6f947..938f4411b57 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2551,6 +2551,7 @@ if (!function_exists("llxFooter"))
print ''."\n";
// Add code for the asynchronous anonymous first ping (for telemetry)
+ // You can use &forceping=1 in parameters to force the ping.
if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || GETPOST('forceping', 'alpha'))
{
//print '';
@@ -2560,6 +2561,8 @@ if (!function_exists("llxFooter"))
{
if (empty($_COOKIE['DOLINSTALLNOPING_'.md5($conf->file->instance_unique_id)]))
{
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
print "\n".''."\n";
print "\n\n";
$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
@@ -2580,7 +2583,8 @@ if (!function_exists("llxFooter"))
entity: "entity; ?>",
dbtype: "type); ?>",
country_code: "country_code); ?>",
- php_version: ""
+ php_version: "",
+ os_version: ""
},
success: function (data, status, xhr) { // success callback function (data contains body of response)
console.log("Ping ok");