Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean code of lib_notification. Now use cache like other js.

Browse Source
This commit is contained in:
Laurent Destailleur
2021-07-08 23:19:43 +02:00
parent 4e69afb253
commit aa9d98a336
4 changed files with 140 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/js/lib_foot.js.php
View File

@@ -47,6 +47,11 @@ session_cache_limiter('public');
require_once '../../main.inc.php'; require_once '../../main.inc.php';
/*
* View
*/
// Define javascript type // Define javascript type
top_httphead('text/javascript; charset=UTF-8'); top_httphead('text/javascript; charset=UTF-8');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.

5
htdocs/core/js/lib_head.js.php
View File

@@ -50,6 +50,11 @@ session_cache_limiter('public');
require_once '../../main.inc.php'; require_once '../../main.inc.php';
/*
* View
*/
// Define javascript type // Define javascript type
top_httphead('text/javascript; charset=UTF-8'); top_httphead('text/javascript; charset=UTF-8');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.

67
htdocs/core/js/lib_notification.js.php
View File

@@ -41,44 +41,57 @@ if (!defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', 1); define('NOREQUIREHTML', 1);
} }
session_cache_limiter('public');
require_once '../../main.inc.php'; require_once '../../main.inc.php';
if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER']))) {
global $langs, $conf;
top_httphead('text/javascript; charset=UTF-8'); /*
* View
*/
print 'var login = \''.$_SESSION['dol_login'].'\';'."\n"; top_httphead('text/javascript; charset=UTF-8');
print 'var nowtime = Date.now();'; // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
print 'var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined if (empty($dolibarr_nocache)) {
print 'var time_js_next_test;'."\n"; header('Cache-Control: max-age=10800, public, must-revalidate');
?> } else {
header('Cache-Control: no-cache');
}
/* Check if permission ok */
if (Notification.permission !== "granted") { print "jQuery(document).ready(function () {\n";
//print " console.log('referrer=".dol_escape_js($_SERVER['HTTP_REFERER'])."');\n";
print ' var nowtime = Date.now();';
print ' var time_auto_update = '.$conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY.';'."\n"; // Always defined
print ' var time_js_next_test;'."\n";
?>
/* Check if permission ok */
if (Notification.permission !== "granted") {
console.log("Ask Notification.permission"); console.log("Ask Notification.permission");
Notification.requestPermission() Notification.requestPermission()
} }
/* Launch timer */ /* Launch timer */
// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000; //need milliseconds // We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>; //var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000; //need milliseconds
if (login != '') { var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
setTimeout(first_execution, time_first_execution * 1000);
time_js_next_test = nowtime + time_first_execution; setTimeout(first_execution, time_first_execution * 1000);
console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test); time_js_next_test = nowtime + time_first_execution;
} //first run auto check console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
function first_execution() { function first_execution() {
console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update); console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
check_events(); //one check before setting the new time for other checks check_events(); //one check before setting the new time for other checks
setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
} }
function check_events() { function check_events() {
if (Notification.permission === "granted") if (Notification.permission === "granted")
{ {
time_js_next_test += time_auto_update; time_js_next_test += time_auto_update;
@@ -167,6 +180,8 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
{ {
console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https)."); console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
} }
}
<?php
} }
<?php
print "\n";
print '})'."\n";

4
htdocs/core/js/timepicker.js.php
View File

@@ -47,6 +47,10 @@ session_cache_limiter('public');
require_once '../../main.inc.php'; require_once '../../main.inc.php';
/*
* View
*/
// Define javascript type // Define javascript type
top_httphead('text/javascript; charset=UTF-8'); top_httphead('text/javascript; charset=UTF-8');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.