From 1263b9b1b81d3c0ac96818f438157144a9123b5b Mon Sep 17 00:00:00 2001 From: Ivan K Date: Thu, 13 Mar 2025 10:00:37 +0300 Subject: [PATCH] fix: fix enable/disable functionality to podkop service --- .../resources/view/podkop/podkop.js | 19 ++++++------------- luci-app-podkop/po/ru/podkop.po | 5 ++++- luci-app-podkop/po/templates/podkop.pot | 3 +++ podkop/files/usr/bin/podkop | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js index e0672d1..e2a8a26 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js @@ -677,19 +677,12 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [ // Podkop Status Panel createStatusPanel('Podkop Status', podkopStatus, [ - podkopStatus.running ? - ButtonFactory.createActionButton({ - label: 'Stop Podkop', - type: 'remove', - action: 'stop', - reload: true - }) : - ButtonFactory.createActionButton({ - label: 'Start Podkop', - type: 'apply', - action: 'start', - reload: true - }), + ButtonFactory.createActionButton({ + label: podkopStatus.running ? 'Stop Podkop' : 'Start Podkop', + type: podkopStatus.running ? 'remove' : 'apply', + action: podkopStatus.running ? 'stop' : 'start', + reload: true + }), ButtonFactory.createActionButton({ label: 'Restart Podkop', type: 'apply', diff --git a/luci-app-podkop/po/ru/podkop.po b/luci-app-podkop/po/ru/podkop.po index b4757bb..ccb4e46 100644 --- a/luci-app-podkop/po/ru/podkop.po +++ b/luci-app-podkop/po/ru/podkop.po @@ -746,4 +746,7 @@ msgid "not works in browser" msgstr "не работает в браузере" msgid "not works on router" -msgstr "не работает на роутере" \ No newline at end of file +msgstr "не работает на роутере" + +msgid "Diagnostics" +msgstr "Диагностика" \ No newline at end of file diff --git a/luci-app-podkop/po/templates/podkop.pot b/luci-app-podkop/po/templates/podkop.pot index e478bb1..3f99179 100644 --- a/luci-app-podkop/po/templates/podkop.pot +++ b/luci-app-podkop/po/templates/podkop.pot @@ -1100,4 +1100,7 @@ msgid "not works in browser" msgstr "" msgid "not works on router" +msgstr "" + +msgid "Diagnostics" msgstr "" \ No newline at end of file diff --git a/podkop/files/usr/bin/podkop b/podkop/files/usr/bin/podkop index aca1f8b..06f1a9d 100755 --- a/podkop/files/usr/bin/podkop +++ b/podkop/files/usr/bin/podkop @@ -1965,6 +1965,18 @@ sing_box_add_secure_dns_probe_domain() { log "DNS probe domain ${domain} configured with override to port ${override_port}" } +enable() { + log "Enabling podkop service" + /etc/init.d/podkop enable + log "Podkop service enabled" +} + +disable() { + log "Disabling podkop service" + /etc/init.d/podkop disable + log "Podkop service disabled" +} + case "$1" in start) start @@ -1976,6 +1988,12 @@ case "$1" in stop start ;; + enable) + enable + ;; + disable) + disable + ;; main) main ;;