diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index af5952f6026..aa9dd989c10 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -99,13 +99,21 @@ function first_execution() {
function check_events() {
if (Notification.permission === "granted")
{
+ var newToken = 'notrequired';
+ const allMeta = document.getElementsByTagName("meta");
+ for (let i = 0; i < allMeta.length; i++) {
+ if (allMeta[i].getAttribute("name") == 'anti-csrf-token') {
+ newToken = allMeta[i].getAttribute('content');
+ console.log("newToken in page = "+newToken);
+ }
+ }
time_js_next_test += time_auto_update;
- console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+ console.log("Call ajax to check events with time_js_next_test = "+time_js_next_test);
$.ajax("", {
type: "post", // Usually post or get
async: true,
- data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
+ data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: newToken },
dataType: "json",
success: function (result) {
//console.log(result);
@@ -173,7 +181,7 @@ function check_events() {
$.ajax(""+listofreminderids, {
type: "POST", // Usually post or get
async: true,
- data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
+ data: { time_js_next_test: time_js_next_test, token: newToken }
});
} else {
console.log("No reminder to do found, next search at "+time_js_next_test);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c8187551ea7..0214202957a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1540,6 +1540,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print ''."\n"; // Do not index
print ''."\n"; // Scale for mobile device
print ''."\n";
+ print ''."\n";
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
print ''."\n";
}
@@ -1548,8 +1549,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!empty($mysoc->logo_squarred_mini)) {
$favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
}
- if (!empty($conf->global->MAIN_FAVICON_URL)) {
- $favicon = $conf->global->MAIN_FAVICON_URL;
+ if (getDolGlobalString('MAIN_FAVICON_URL')) {
+ $favicon = getDolGlobalString('MAIN_FAVICON_URL');
}
if (empty($conf->dol_use_jmobile)) {
print ''."\n"; // Not required into an Android webview