lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix escaping of data on ping

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-31 18:44:28 +01:00
parent 25aa301bc7
commit 939f5ce095
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/main.inc.php
View File

@ -2865,35 +2865,35 @@ if (!function_exists("llxFooter"))
timeout: 500, // timeout milliseconds timeout: 500, // timeout milliseconds
cache: false, cache: false,
data: { data: {
hash_algo: "md5", hash_algo: 'md5',
hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
action: "dolibarrping", action: 'dolibarrping',
version: "<?php echo (float) DOL_VERSION; ?>", version: '<?php echo (float) DOL_VERSION; ?>',
entity: "<?php echo (int) $conf->entity; ?>", entity: '<?php echo (int) $conf->entity; ?>',
dbtype: "<?php echo dol_escape_js($db->type); ?>", dbtype: '<?php echo dol_escape_js($db->type); ?>',
country_code: "<?php echo dol_escape_js($mysoc->country_code); ?>", country_code: '<?php echo dol_escape_js($mysoc->country_code); ?>',
php_version: "<?php echo phpversion(); ?>", php_version: '<?php echo dol_escape_js(phpversion()); ?>',
os_version: "<?php echo version_os('smr'); ?>", os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
distrib: "<?php echo $distrib ? $distrib : 'unknown'; ?>" distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
}, },
success: function (data, status, xhr) { // success callback function (data contains body of response) success: function (data, status, xhr) { // success callback function (data contains body of response)
console.log("Ping ok"); console.log("Ping ok");
$.ajax({ $.ajax({
method: "GET", method: 'GET',
url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>", url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
timeout: 500, // timeout milliseconds timeout: 500, // timeout milliseconds
cache: false, cache: false,
data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingok" }, // to update data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' }, // for update
}); });
}, },
error: function (data,status,xhr) { // error callback function error: function (data,status,xhr) { // error callback function
console.log("Ping ko: " + data); console.log("Ping ko: " + data);
$.ajax({ $.ajax({
method: "GET", method: 'GET',
url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>", url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
timeout: 500, // timeout milliseconds timeout: 500, // timeout milliseconds
cache: false, cache: false,
data: { hash_algo: "md5", hash_unique_id: "<?php echo dol_escape_js($hash_unique_id); ?>", action: "firstpingko" }, data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
}); });
} }
}); });