From 587bdffd17ab28b83f76978c6f1e6690387a926a Mon Sep 17 00:00:00 2001
From: KJ7ICE <85096517+kj7ice@users.noreply.github.com>
Date: Sun, 26 Jun 2022 17:00:53 -0700
Subject: [PATCH 1/2] Expire old entries for MariaDB/MySQL

---
 db.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/db.js b/db.js
index c47352ee..899d1e38 100644
--- a/db.js
+++ b/db.js
@@ -109,7 +109,13 @@ module.exports.CreateDB = function (parent, func) {
             obj.eventsfile.remove({ time: { '$lt': new Date(Date.now() - (expireEventsSeconds * 1000)) } }, { multi: true }); // Force delete older events
             obj.powerfile.remove({ time: { '$lt': new Date(Date.now() - (expirePowerEventsSeconds * 1000)) } }, { multi: true }); // Force delete older events
             obj.serverstatsfile.remove({ time: { '$lt': new Date(Date.now() - (expireServerStatsSeconds * 1000)) } }, { multi: true }); // Force delete older events
+        } else if ((obj.databaseType == 4) || (obj.databaseType == 5)) { // MariaDB or MySQL
+            sqlDbQuery('DELETE FROM events WHERE time < ?', [new Date(Date.now() - (expireEventsSeconds * 1000))], function (doc, err) { }); // Delete events older than expireEventsSeconds
+            sqlDbQuery('DELETE FROM power WHERE time < ?', [new Date(Date.now() - (expirePowerEventsSeconds * 1000))], function (doc, err) { }); // Delete events older than expirePowerSeconds
+            sqlDbQuery('DELETE FROM serverstats WHERE expire < ?', [new Date()], function (doc, err) { }); // Delete events where expiration date is in the past
+            sqlDbQuery('DELETE FROM smbios WHERE expire < ?', [new Date()], function (doc, err) { }); // Delete events where expiration date is in the past
         }
+        
         obj.removeInactiveDevices();
     }
 
@@ -1471,7 +1477,7 @@ module.exports.CreateDB = function (parent, func) {
 
             // Database actions on the Server Stats collection
             obj.SetServerStats = function (data, func) { sqlDbQuery('REPLACE INTO serverstats VALUE (?, ?, ?)', [data.time, data.expire, JSON.stringify(data)], func); };
-            obj.GetServerStats = function (hours, func) { var t = new Date(); t.setTime(t.getTime() - (60 * 60 * 1000 * hours)); sqlDbQuery('SELECT doc FROM serverstats WHERE time > ?', [t], func); }; // TODO: Expire old entries
+            obj.GetServerStats = function (hours, func) { var t = new Date(); t.setTime(t.getTime() - (60 * 60 * 1000 * hours)); sqlDbQuery('SELECT doc FROM serverstats WHERE time > ?', [t], func); };
 
             // Read a configuration file from the database
             obj.getConfigFile = function (path, func) { obj.Get('cfile/' + path, func); }

From f996fd2d79e0fcd56ba993df01984550d76caa7e Mon Sep 17 00:00:00 2001
From: Marcin Wilk <marcin@marcinwilk.eu>
Date: Mon, 27 Jun 2022 12:07:19 +0200
Subject: [PATCH 2/2] Update Polish translation

Add missing translation up to v 1.41
---
 translate/translate.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/translate/translate.json b/translate/translate.json
index 9272a478..e4649006 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -15671,6 +15671,7 @@
     },
     {
       "en": "Connect using hardware KVM",
+	  "pl": "Połącz za pomocą sprzętowego KVM",
       "xloc": [
         "default.handlebars->container->column_l->p11->deskarea0->deskarea1->3->connectbutton1hspan"
       ]
@@ -26214,6 +26215,7 @@
     },
     {
       "en": "Failed to sign agent {0}: {1}",
+	  "pl": "Nieudane przypisanie agenta {0}: {1}",
       "xloc": [
         "default.handlebars->41->104"
       ]
@@ -32682,6 +32684,7 @@
     },
     {
       "en": "Intel&reg; Standard Manageability (Intel&reg; SM)",
+	  "pl": "Intel&reg; Standard Manageability (Intel&reg; SM)",
       "xloc": [
         "default-mobile.handlebars->11->578",
         "default.handlebars->41->1467"
@@ -32689,12 +32692,14 @@
     },
     {
       "en": "Intel&reg;AMT",
+	  "pl": "Intel&reg;AMT",
       "xloc": [
         "default.handlebars->41->957"
       ]
     },
     {
       "en": "Intel&reg;SM",
+	  "pl": "Intel&reg;SM",
       "xloc": [
         "default.handlebars->41->955"
       ]
@@ -49921,6 +49926,7 @@
     },
     {
       "en": "Redirection port or KVM feature is disabled",
+	  "pl": "Pzekierowania portu lub funkcja KVM są wyłączone",
       "xloc": [
         "default.handlebars->container->column_l->p11->p11warning->3",
         "default.handlebars->container->column_l->p12->p12warning->3"
@@ -53199,6 +53205,7 @@
     },
     {
       "en": "Reverse Mouse Wheel",
+	  "pl": "Odwróć Zachowanie Rolki Myszy",
       "xloc": [
         "default.handlebars->container->dialog->dialogBody->dialog7->d7amtkvm->5->d7otherset->7",
         "default.handlebars->container->dialog->dialogBody->dialog7->d7meshkvm->d7desktopOtherSettings->d7otherset2->3",