Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2025-12-10 21:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reformat type of parameters

Browse Source
This commit is contained in:
remittor
2024-10-16 16:29:30 +03:00
parent 0f6e981616
commit b28c89e569
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
luci-app-zapret/htdocs/luci-static/resources/view/zapret/settings.js
View File

@@ -60,8 +60,8 @@ return view.extend({
s.tab(tabname, _('Main settings')); s.tab(tabname, _('Main settings'));
o = s.taboption(tabname, form.ListValue, 'FWTYPE', _('FWTYPE')); o = s.taboption(tabname, form.ListValue, 'FWTYPE', _('FWTYPE'));
o.value('nftables', 'NFTables'); o.value('nftables', 'nftables');
//o.value('iptables', 'IPTables'); //o.value('iptables', 'iptables');
//o.value('ipfw', 'ipfw'); //o.value('ipfw', 'ipfw');
o = s.taboption(tabname, form.ListValue, 'MODE', _('MODE')); o = s.taboption(tabname, form.ListValue, 'MODE', _('MODE'));
@@ -74,17 +74,17 @@ return view.extend({
o.value('software', 'software'); o.value('software', 'software');
o.value('hardware', 'hardware'); o.value('hardware', 'hardware');
o = s.taboption(tabname, form.ListValue, 'INIT_APPLY_FW', _('INIT_APPLY_FW')); o = s.taboption(tabname, form.Flag, 'INIT_APPLY_FW', _('INIT_APPLY_FW'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
o = s.taboption(tabname, form.ListValue, 'DISABLE_IPV4', _('DISABLE_IPV4')); o = s.taboption(tabname, form.Flag, 'DISABLE_IPV4', _('DISABLE_IPV4'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 1;
o = s.taboption(tabname, form.ListValue, 'DISABLE_IPV6', _('DISABLE_IPV6')); o = s.taboption(tabname, form.Flag, 'DISABLE_IPV6', _('DISABLE_IPV6'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
o = s.taboption(tabname, form.ListValue, 'MODE_FILTER', _('MODE_FILTER')); o = s.taboption(tabname, form.ListValue, 'MODE_FILTER', _('MODE_FILTER'));
//o.value('none', 'none'); //o.value('none', 'none');
@@ -92,21 +92,21 @@ return view.extend({
o.value('hostlist', 'hostlist'); o.value('hostlist', 'hostlist');
o.value('autohostlist', 'autohostlist'); o.value('autohostlist', 'autohostlist');
o = s.taboption(tabname, form.ListValue, 'MODE_HTTP', _('MODE_HTTP')); o = s.taboption(tabname, form.Flag, 'MODE_HTTP', _('MODE_HTTP'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
o = s.taboption(tabname, form.ListValue, 'MODE_HTTP_KEEPALIVE', _('MODE_HTTP_KEEPALIVE')); o = s.taboption(tabname, form.Flag, 'MODE_HTTP_KEEPALIVE', _('MODE_HTTP_KEEPALIVE'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
o = s.taboption(tabname, form.ListValue, 'MODE_HTTPS', _('MODE_HTTPS')); o = s.taboption(tabname, form.Flag, 'MODE_HTTPS', _('MODE_HTTPS'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
o = s.taboption(tabname, form.ListValue, 'MODE_QUIC', _('MODE_QUIC')); o = s.taboption(tabname, form.Flag, 'MODE_QUIC', _('MODE_QUIC'));
o.value('0', 'False'); o.rmempty = false;
o.value('1', 'True'); o.default = 0;
/* NFQWS_OPT_DESYNC tab */ /* NFQWS_OPT_DESYNC tab */
@@ -178,20 +178,22 @@ return view.extend({
o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries')); o = s.taboption(tabname, form.Button, '_user_entries_btn', _('User hostname entries'));
o.inputtitle = _('Edit'); o.inputtitle = _('Edit');
o.inputstyle = 'edit btn'; o.inputstyle = 'edit btn';
o.description = tools.hostsUserFN;
o.onclick = () => new tools.fileEditDialog( o.onclick = () => new tools.fileEditDialog(
tools.userEntriesFile, tools.hostsUserFN,
_('User entries'), _('User entries'),
_('One hostname per line.<br />Examples:'), _('One hostname per line.<br />Examples:'),
'<code>domain.net<br />sub.domain.com<br />googlevideo.com</code>', '<code>domain.net<br />sub.domain.com<br />googlevideo.com</code>',
15 15
).show(); ).show();
o = s.taboption(tabname, form.Button, '_ip_filter_btn', _('User IP entries')); o = s.taboption(tabname, form.Button, '_user_ip_filter_btn', _('User IP entries'));
o.inputtitle = _('Edit'); o.inputtitle = _('Edit');
o.inputstyle = 'edit btn'; o.inputstyle = 'edit btn';
o.description = tools.iplstUserFN;
o.onclick = () => new tools.fileEditDialog( o.onclick = () => new tools.fileEditDialog(
tools.ipFilterFile, tools.iplstUserFN,
_('IP filter'), _('User IP filter'),
_('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'), _('Patterns can be strings or regular expressions. Each pattern in a separate line<br />Examples:'),
'<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>', '<code>128.199.0.0/16<br />34.217.90.52<br />162.13.190.77</code>',
15 15

5
luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
View File

@@ -37,9 +37,8 @@ document.head.append(E('style', {'type': 'text/css'},
return baseclass.extend({ return baseclass.extend({
appName : 'zapret', appName : 'zapret',
execPath : '/opt/zapret/init.d/openwrt/zapret', execPath : '/opt/zapret/init.d/openwrt/zapret',
parsersDir : '/usr/libexec/ruantiblock', hostsUserFN : '/opt/zapret/ipset/zapret-hosts-user.txt',
userEntriesFile : '/opt/zapret/ipset/zapret-hosts-user.txt', iplstUserFN : '/opt/zapret/ipset/zapret-ip-user.txt',
ipFilterFile : '/opt/zapret/ipset/zapret-ip-user.txt',
infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>', infoLabelStarting : '<span class="label-status starting">' + _('Starting') + '</span>',
infoLabelRunning : '<span class="label-status running">' + _('Enabled') + '</span>', infoLabelRunning : '<span class="label-status running">' + _('Enabled') + '</span>',