From e9f9a6d1d286bf0d479668fac9cca0224610bd52 Mon Sep 17 00:00:00 2001 From: ToMtOm Date: Mon, 10 Nov 2025 10:20:41 +0100 Subject: [PATCH 1/5] FIX translations --- .github/workflows/translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 29ae47a..3baf10a 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -10,6 +10,6 @@ jobs: auto-translate: runs-on: ubuntu-latest steps: - - uses: Mips2648/plugins-translations@main + - uses: Mips2648/plugins-translations@v1 with: deepl_api_key: ${{ secrets.DEEPL_API_KEY }} From c05681c1b50ba949fe022729b28f8be06718395a Mon Sep 17 00:00:00 2001 From: ToMtOm Date: Mon, 10 Nov 2025 10:23:35 +0100 Subject: [PATCH 2/5] ADD funding --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..6b66fcb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +ko_fi: tomitomas From 3eae47d24cfb424ad3f9f57429ea24da335e4727 Mon Sep 17 00:00:00 2001 From: ToMtOm Date: Mon, 10 Nov 2025 10:23:53 +0100 Subject: [PATCH 3/5] ADD actionDoneBy --- core/class/digiaction.class.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/class/digiaction.class.php b/core/class/digiaction.class.php index 8d0db48..d4470f2 100755 --- a/core/class/digiaction.class.php +++ b/core/class/digiaction.class.php @@ -56,6 +56,18 @@ public function preSave() { public function postSave() { + $currentMode = $this->getCmd(null, 'actionDoneBy'); + if (!is_object($currentMode)) { + $currentMode = new digiactionCmd(); + $currentMode->setOrder(10); + } + $currentMode->setName(__('Dernier utilisateur', __FILE__)); + $currentMode->setEqLogic_id($this->id); + $currentMode->setLogicalId('actionDoneBy'); + $currentMode->setType('info'); + $currentMode->setSubType('string'); + $currentMode->save(); + $currentMode = $this->getCmd(null, 'currentMode'); if (!is_object($currentMode)) { $currentMode = new digiactionCmd(); @@ -796,8 +808,10 @@ public function execute($_options = array()) { $eqLogic->checkAndUpdateCmd('digimessage', $txtOK); if (!empty($_options['userName'])) { log::add('digiaction', 'info', '│ Commande "' . $this->getName() . '" a été réalisée par : ' . $_options['userName']); + $eqLogic->checkAndUpdateCmd('actionDoneBy', $_options['userName']); } else { log::add('digiaction', 'info', '│ Commande "' . $this->getName() . '" a été réalisée (sans contrôle)'); + $eqLogic->checkAndUpdateCmd('actionDoneBy', ''); } } From d3bf2e4c4bcbb66ce91a7fb632d14b462f628d3d Mon Sep 17 00:00:00 2001 From: ToMtOm Date: Mon, 10 Nov 2025 10:39:47 +0100 Subject: [PATCH 4/5] FIX trad --- core/class/digiaction.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/class/digiaction.class.php b/core/class/digiaction.class.php index d4470f2..5a282a6 100755 --- a/core/class/digiaction.class.php +++ b/core/class/digiaction.class.php @@ -438,7 +438,10 @@ public function toHtml($_version = 'dashboard') { // $replace['#message#'] = $this->getCmd(null, 'digimessage')->execCmd(); $replace['#randomkeys#'] = $this->getConfiguration('randomkeys', 0); - return $this->postToHtml($_version, template_replace($replace, getTemplate('core', $version, 'digiaction', 'digiaction'))); + // return $this->postToHtml($_version, template_replace($replace, getTemplate('core', $version, 'digiaction', 'digiaction'))); + $html = template_replace($replace, getTemplate('core', $version, __CLASS__, __CLASS__)); + $html = translate::exec($html, 'plugins/' . __CLASS__ . '/core/template/' . $version . '/' . __CLASS__ . '.html'); + return $html; } @@ -545,6 +548,7 @@ public function getAvailableModeHTML() { public function verifCodeUser($userCode, $nextCmdId) { self::addLogTemplate('CHECK USER CODE'); + $userPanic = false; try { // check if the new mode requires a password From eb398a625667bf0c937bd254be923b17bc8ef489 Mon Sep 17 00:00:00 2001 From: tomitomas <12429858+tomitomas@users.noreply.github.com> Date: Mon, 10 Nov 2025 09:40:09 +0000 Subject: [PATCH 5/5] Auto update translation done by Mips2648/plugins-translations workflow --- core/i18n/de_DE.json | 1 + core/i18n/en_US.json | 1 + core/i18n/es_ES.json | 1 + 3 files changed, 3 insertions(+) diff --git a/core/i18n/de_DE.json b/core/i18n/de_DE.json index 037a34f..5ef4c9f 100644 --- a/core/i18n/de_DE.json +++ b/core/i18n/de_DE.json @@ -11,6 +11,7 @@ "Aucun utilisateur indiqué (champs \"titre\")": "Kein Benutzer angegeben (Felder \"Titel\")", "Changer code utilisateur": "Benutzercode ändern", "Code non valide": "Ungültiger Code", + "Dernier utilisateur": "Letzter Nutzer", "Erreur lors de l\\'éxecution de ": "Fehler bei der Ausführung von", "La commande de mode courant est introuvable": "Der Befehl für den aktuellen Modus wurde nicht gefunden", "MaJ Message": "MaJ Nachricht", diff --git a/core/i18n/en_US.json b/core/i18n/en_US.json index 6c3913d..bd40894 100644 --- a/core/i18n/en_US.json +++ b/core/i18n/en_US.json @@ -11,6 +11,7 @@ "Aucun utilisateur indiqué (champs \"titre\")": "No user indicated (\"title\" fields)", "Changer code utilisateur": "Change user code", "Code non valide": "Invalid code", + "Dernier utilisateur": "Last user", "Erreur lors de l\\'éxecution de ": "Error while executing", "La commande de mode courant est introuvable": "Current mode command not found", "MaJ Message": "MaJ Message", diff --git a/core/i18n/es_ES.json b/core/i18n/es_ES.json index 9e88beb..26cf878 100644 --- a/core/i18n/es_ES.json +++ b/core/i18n/es_ES.json @@ -11,6 +11,7 @@ "Aucun utilisateur indiqué (champs \"titre\")": "Ningún usuario indicado (campos \"título\")", "Changer code utilisateur": "Cambiar el código de usuario", "Code non valide": "Código no válido", + "Dernier utilisateur": "Último usuario", "Erreur lors de l\\'éxecution de ": "Error durante la ejecución de", "La commande de mode courant est introuvable": "Comando de modo actual no encontrado", "MaJ Message": "Mensaje MaJ",