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 70404d4..dcfbf92 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 @@ -8,24 +8,26 @@ return view.extend({ async render() { var m, s, o; - m = new form.Map('podkop', _('Podkop configuration')); + m = new form.Map('podkop', _('Podkop configuration'), null, ['main', 'second']); s = m.section(form.TypedSection, 'main'); s.anonymous = true; - // Basic Settings tab o = s.tab('basic', _('Basic Settings')); o = s.taboption('basic', form.ListValue, 'mode', _('Connection Type'), _('Select between VPN and Proxy connection methods for traffic routing')); o.value('vpn', ('VPN')); o.value('proxy', ('Proxy')); + o.ucisection = 'main'; o = s.taboption('basic', form.TextValue, 'proxy_string', _('Proxy Configuration URL'), _('Enter connection string starting with vless:// or ss:// for proxy configuration')); o.depends('mode', 'proxy'); o.rows = 5; + o.ucisection = 'main'; o = s.taboption('basic', form.ListValue, 'interface', _('Network Interface'), _('Select network interface for VPN connection')); o.depends('mode', 'vpn'); + o.ucisection = 'main'; try { const devices = await network.getDevices(); @@ -48,6 +50,7 @@ return view.extend({ o = s.taboption('basic', form.Flag, 'domain_list_enabled', _('Predefined Domain Lists'), _('github.com/itdoginfo/allow-domains')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('basic', form.ListValue, 'domain_list', _('Domain List'), _('Select a predefined domain list')); o.placeholder = 'placeholder'; @@ -56,10 +59,12 @@ return view.extend({ o.value('ua', 'Ukraine'); o.depends('domain_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('basic', form.Flag, 'subnets_list_enabled', _('Predefined Service Networks'), _('Enable routing for popular services like Twitter, Meta, and Discord')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('basic', form.DynamicList, 'subnets', _('Service Networks'), _('Select predefined service networks for routing')); o.placeholder = 'Service network list'; @@ -68,18 +73,20 @@ return view.extend({ o.value('discord', 'Discord(voice)'); o.depends('subnets_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; - // User Settings tab o = s.tab('custom', _('User Settings')); o = s.taboption('custom', form.Flag, 'custom_domains_list_enabled', _('User Domain List'), _('Enable and manage your custom list of domains for selective routing')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('custom', form.DynamicList, 'custom_domains', _('User Domains'), _('Enter domain names without protocols (example: sub.example.com or example.com)')); o.placeholder = 'Domains list'; o.depends('custom_domains_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -96,11 +103,13 @@ return view.extend({ o = s.taboption('custom', form.Flag, 'custom_download_domains_list_enabled', _('Remote Domain Lists'), _('Download and use domain lists from remote URLs')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('custom', form.DynamicList, 'custom_download_domains', _('Remote Domain URLs'), _('Enter full URLs starting with http:// or https://')); o.placeholder = 'URL'; o.depends('custom_download_domains_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -120,11 +129,13 @@ return view.extend({ o = s.taboption('custom', form.Flag, 'custom_subnets_list_enabled', _('User Subnet List'), _('Enable and manage your custom list of IP subnets for selective routing')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('custom', form.DynamicList, 'custom_subnets', _('User Subnets'), _('Enter subnet in CIDR notation (example: 192.168.1.0/24)')); o.placeholder = 'Subnets list'; o.depends('custom_subnets_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -157,11 +168,13 @@ return view.extend({ o = s.taboption('custom', form.Flag, 'custom_download_subnets_list_enabled', _('Remote Subnet Lists'), _('Download and use subnet lists from remote URLs')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('custom', form.DynamicList, 'custom_download_subnets', _('Remote Subnet URLs'), _('Enter full URLs starting with http:// or https://')); o.placeholder = 'URL'; o.depends('custom_download_subnets_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -178,26 +191,29 @@ return view.extend({ } }; - // Additional Settings tab o = s.tab('additional', _('Additional Settings')); o = s.taboption('additional', form.Flag, 'delist_domains_enabled', _('Domain Exclusions'), _('Exclude specific domains from routing rules')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.DynamicList, 'delist_domains', _('Excluded Domains'), _('Domains to be excluded from routing')); o.placeholder = 'Delist domains'; o.depends('delist_domains_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.Flag, 'all_traffic_from_ip_enabled', _('Force Proxy IPs'), _('Specify local IP addresses whose traffic will always use the configured route')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.DynamicList, 'all_traffic_ip', _('Local IPs'), _('Enter valid IPv4 addresses')); o.placeholder = 'IP'; o.depends('all_traffic_from_ip_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -223,11 +239,13 @@ return view.extend({ o = s.taboption('additional', form.Flag, 'exclude_from_ip_enabled', _('Bypass Proxy IPs'), _('Specify local IP addresses that will never use the configured route')); o.default = '0'; o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.DynamicList, 'exclude_traffic_ip', _('Local IPs'), _('Enter valid IPv4 addresses')); o.placeholder = 'IP'; o.depends('exclude_from_ip_enabled', '1'); o.rmempty = false; + o.ucisection = 'main'; o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -254,16 +272,19 @@ return view.extend({ o.default = '0'; o.depends('mode', 'proxy'); o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.Flag, 'socks5', _('Mixed enable'), _('Browser port: 2080')); o.default = '0'; o.depends('mode', 'proxy'); o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.Flag, 'exclude_ntp', _('Exclude NTP'), _('For issues with open connections sing-box')); o.default = '0'; o.depends('mode', 'proxy'); o.rmempty = false; + o.ucisection = 'main'; o = s.taboption('additional', form.ListValue, 'update_interval', _('List Update Frequency'), _('Select how often the lists will be updated')); o.value('0 */1 * * *', _('Every hour')); @@ -275,24 +296,28 @@ return view.extend({ o.value('0 4 * * 0', _('Once a week on Sunday at 04:00')); o.default = '0 4 * * *'; o.rmempty = false; + o.ucisection = 'main'; - // Secondary Route tab o = s.tab('second_settings', _('Secondary Route')); o = s.taboption('second_settings', form.Flag, 'second_enable', _('Secondary Route Enable'), _('Enable secondary routing configuration')); o.default = '0'; o.rmempty = false; + o.ucisection = 'second'; // This is correct o = s.taboption('second_settings', form.ListValue, 'second_mode', _('Connection Type'), _('Select between VPN and Proxy for secondary route')); o.value('vpn', ('VPN')); o.value('proxy', ('Proxy')); 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.depends('second_mode', 'proxy'); + o.ucisection = 'second'; // Changed to 'second' o = s.taboption('second_settings', form.ListValue, 'second_interface', _('Network Interface'), _('Select network interface for VPN connection')); o.depends('second_mode', 'vpn'); + o.ucisection = 'second'; // Changed to 'second' try { const devices = await network.getDevices(); @@ -316,22 +341,26 @@ return view.extend({ o.default = '0'; o.rmempty = false; o.depends('second_enable', '1'); + o.ucisection = 'second'; // Changed to 'second' o = s.taboption('second_settings', form.ListValue, 'service_list', _('Service List'), _('Select predefined services for secondary routing')); o.placeholder = 'placeholder'; o.value('youtube', 'Youtube'); o.depends('domain_service_enabled', '1'); o.rmempty = false; + o.ucisection = 'second'; // Changed to 'second' o = s.taboption('second_settings', form.Flag, 'second_custom_domains_list_enabled', _('Secondary Domain List'), _('Configure custom domains for secondary routing path')); o.default = '0'; o.rmempty = false; o.depends('second_enable', '1'); + o.ucisection = 'second'; // Changed to 'second' o = s.taboption('second_settings', form.DynamicList, 'second_custom_domains', _('Secondary Domains'), _('Enter domain names without protocols (example: sub.example.com or example.com)')); o.placeholder = 'Domains list'; o.depends('second_custom_domains_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'second'; // Changed to 'second' o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; @@ -349,11 +378,13 @@ return view.extend({ o.default = '0'; o.rmempty = false; o.depends('second_enable', '1'); + o.ucisection = 'second'; // Changed to 'second' o = s.taboption('second_settings', form.DynamicList, 'second_custom_subnets', _('Secondary Subnets'), _('Enter subnet in CIDR notation (example: 192.168.1.0/24)')); o.placeholder = 'Subnets list'; o.depends('second_custom_subnets_list_enabled', '1'); o.rmempty = false; + o.ucisection = 'second'; // Changed to 'second' o.validate = function (section_id, value) { if (!value || value.length === 0) { return true; diff --git a/podkop/files/etc/init.d/podkop b/podkop/files/etc/init.d/podkop index 1abf9c2..4fd3f7c 100755 --- a/podkop/files/etc/init.d/podkop +++ b/podkop/files/etc/init.d/podkop @@ -544,7 +544,8 @@ lists_domains_download() { sed -i 's/fw4#vpn_domains/PodkopTable#podkop2_domains/g' /tmp/dnsmasq.d/podkop-domains.lst else sed -i 's/fw4#vpn_domains/PodkopTable#podkop_domains/g' /tmp/dnsmasq.d/podkop-domains.lst - fi return 0 + fi + return 0 else log "GitHub is not available. Check the internet availability [$count sec]" count=$((count + 1))