From 17921defa94d56449b87a52efe2d82193aa1dc27 Mon Sep 17 00:00:00 2001
From: Max Pozdeev <maxpozdeev@gmail.com>
Date: Mon, 7 Feb 2022 23:41:01 +0300
Subject: [PATCH] update ajax response caching

---
 src/includes/mytinytodo_ajax_storage.js |  9 ++++-----
 src/init.php                            | 13 ++++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/includes/mytinytodo_ajax_storage.js b/src/includes/mytinytodo_ajax_storage.js
index b557e84..f35b9dd 100644
--- a/src/includes/mytinytodo_ajax_storage.js
+++ b/src/includes/mytinytodo_ajax_storage.js
@@ -35,7 +35,7 @@ mytinytodoStorageAjax.prototype =
 
 	loadLists: function(params, callback)
 	{
-		$.getJSON(this.mtt.mttUrl+'ajax.php?loadLists'+'&rnd='+Math.random(), callback);
+		$.getJSON(this.mtt.mttUrl+'ajax.php?loadLists', callback);
 	},
 
 
@@ -45,7 +45,6 @@ mytinytodoStorageAjax.prototype =
 		if(params.search && params.search != '') q += '&s='+encodeURIComponent(params.search);
 		if(params.tag && params.tag != '') q += '&t='+encodeURIComponent(params.tag);
 		if(params.setCompl && params.setCompl != 0) q += '&setCompl=1';
-		q += '&rnd='+Math.random();
 
 		$.getJSON(this.mtt.mttUrl+'ajax.php?loadTasks&list='+params.list+'&compl='+params.compl+'&sort='+params.sort+q, callback);
 	},
@@ -94,7 +93,7 @@ mytinytodoStorageAjax.prototype =
 
 	setPrio: function(params, callback)
 	{
-		$.getJSON(this.mtt.mttUrl+'ajax.php?setPrio='+params.id+'&prio='+params.prio+'&rnd='+Math.random(), callback);
+		$.getJSON(this.mtt.mttUrl+'ajax.php?setPrio='+params.id+'&prio='+params.prio, callback);
 	},
 
 
@@ -114,12 +113,12 @@ mytinytodoStorageAjax.prototype =
 
 	suggestTags: function(params, callback)
 	{
-		$.getJSON(this.mtt.mttUrl+'ajax.php?suggestTags', {list:params.list, q:params.q, rnd:Math.random()}, callback);
+		$.getJSON(this.mtt.mttUrl+'ajax.php?suggestTags', {list:params.list, q:params.q}, callback);
 	},
 
 	tagCloud: function(params, callback)
 	{
-		$.getJSON(this.mtt.mttUrl+'ajax.php?tagCloud&list='+params.list+'&rnd='+Math.random(), callback);
+		$.getJSON(this.mtt.mttUrl+'ajax.php?tagCloud&list='+params.list, callback);
 	},
 
 	moveTask: function(params, callback)
diff --git a/src/init.php b/src/init.php
index 72e5125..4974dfa 100644
--- a/src/init.php
+++ b/src/init.php
@@ -255,8 +255,12 @@ function get_unsafe_mttinfo($v)
             $_mttinfo['title'] = (Config::get('title') != '') ? Config::get('title') : __('My Tiny Todolist');
             return $_mttinfo['title'];
         case 'version':
-            if (MTT_DEBUG) return time(); //force no-cache for dev needs
-            return mytinytodo\Version::VERSION;
+            if (MTT_DEBUG) {
+                $_mttinfo['version'] = mytinytodo\Version::VERSION . '-' . time();
+            } else {
+                $_mttinfo['version'] = mytinytodo\Version::VERSION;
+            }
+            return $_mttinfo['version'];
     }
 }
 
@@ -269,7 +273,10 @@ function reset_mttinfo($key)
 function jsonExit($data)
 {
     header('Content-type: application/json; charset=utf-8');
-    echo json_encode($data);
+    header('Cache-Control: no-store');
+    header('Pragma: no-cache'); // for old HTTP/1.0 intermediate caches
+    header_remove('Expires');
+    echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
     exit;
 }