From d8a860fb2fc1cc6fd818b380209386e59f379fad Mon Sep 17 00:00:00 2001
From: Ivan Kvashonkin <iskvashonkin@activebc.ru>
Date: Sun, 10 Nov 2024 18:39:14 +0300
Subject: [PATCH] fix: second proxy configuration fixing

---
 .../resources/view/podkop/podkop.js            |  2 +-
 podkop/files/etc/init.d/podkop                 | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 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 dcfbf92..59fb75e 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
@@ -311,7 +311,7 @@ return view.extend({
         o.depends('second_enable', '1');
         o.ucisection = 'second';  // Changed to 'second'
 
-        o = s.taboption('second_settings', form.Value, 'second_proxy_string', _('Proxy Configuration URL'), _('Enter connection string starting with vless:// or ss:// for proxy configuration'));
+        o = s.taboption('second_settings', form.TextValue, 'second_proxy_string', _('Proxy Configuration URL'), _('Enter connection string starting with vless:// or ss:// for proxy configuration'));
         o.depends('second_mode', 'proxy');
         o.ucisection = 'second';  // Changed to 'second'
 
diff --git a/podkop/files/etc/init.d/podkop b/podkop/files/etc/init.d/podkop
index 4fd3f7c..3300594 100755
--- a/podkop/files/etc/init.d/podkop
+++ b/podkop/files/etc/init.d/podkop
@@ -315,13 +315,12 @@ list_update() {
         /etc/init.d/dnsmasq restart
     fi
 
-    config_get_bool custom_domains_list_enabled "second" "custom_domains_list_enabled" "0"
-    if [ "$custom_domains_list_enabled" -eq 1 ]; then
+    config_get_bool second_custom_domains_list_enabled "second" "second_custom_domains_list_enabled" "0"
+    if [ "$second_custom_domains_list_enabled" -eq 1 ]; then
         log "Adding a custom domains list. Second podkop"
         add_set "podkop2_domains" "second"
         rm -f /tmp/dnsmasq.d/podkop2-custom-domains.lst
-        config_list_foreach second custom_domains "list_delist_domains"
-        config_list_foreach second custom_domains "list_custom_domains_create" "podkop2"
+        config_list_foreach second second_custom_domains "list_custom_domains_create" "podkop2"
         dnsmasq_config_check podkop2-custom-domains.lst
     fi
 
@@ -331,11 +330,11 @@ list_update() {
         add_set "podkop2_domains" "second"
         config_get service_list second "service_list"
         lists_services_download "$service_list"
-        config_list_foreach second custom_domains "list_delist_domains"
+        config_list_foreach second second_custom_domains "list_delist_domains"
         dnsmasq_config_check podkop2-domains.lst
     fi
 
-    if [ "$custom_domains_list_enabled" -eq 1 ] || [ "$domain_service_enabled" -eq 1 ]; then
+    if [ "$second_custom_domains_list_enabled" -eq 1 ] || [ "$domain_service_enabled" -eq 1 ]; then
         /etc/init.d/dnsmasq restart
     fi
 
@@ -362,11 +361,11 @@ list_update() {
         config_list_foreach main custom_subnets "list_custom_subnets_create" "podkop"
     fi
 
-    config_get_bool custom_subnets_list_enabled "second" "custom_subnets_list_enabled" "0"
-    if [ "$custom_subnets_list_enabled" -eq 1 ]; then
+    config_get_bool second_custom_subnets_list_enabled "second" "second_custom_subnets_list_enabled" "0"
+    if [ "$second_custom_subnets_list_enabled" -eq 1 ]; then
         log "Adding a custom subnets list. Second"
         add_set "podkop2_subnets" "second"
-        config_list_foreach second custom_subnets "list_custom_subnets_create" "podkop2"
+        config_list_foreach second second_custom_subnets "list_custom_subnets_create" "podkop2"
     fi
 }
 
@@ -852,7 +851,6 @@ sing_box_config_vless() {
         end)' "$template_config" >/etc/sing-box/config.json
 }
 
-# make one function for full and outbound only
 sing_box_config_outbound_shadowsocks() {
     local STRING="$1"
     local outbound="$2"