fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-12-26 23:04:52 +08:00
parent 36d92a4b61
commit 854d634559
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua
View File

@ -62,7 +62,7 @@ if nodes_display:find("compact_display_nodes") then
local group = m:get(n, "group") or ""
local remarks = m:get(n, "remarks") or ""
local type = m:get(n, "type") or ""
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.type' value='%s'>", appname, n, type)
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.type' value='%s'/>", appname, n, type)
if type == "Xray" or type == "V2ray" then
local protocol = m:get(n, "protocol")
if protocol == "_balancing" then
@ -80,8 +80,8 @@ if nodes_display:find("compact_display_nodes") then
else
str = str .. string.format("（%s:%s）", address, port)
end
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.address' value='%s'>", appname, n, address)
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.port' value='%s'>", appname, n, port)
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.address' value='%s'/>", appname, n, address)
str = str .. string.format("<input type='hidden' id='cbid.%s.%s.port' value='%s'/>", appname, n, port)
end
return str
end

10
package/lienol/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
View File

@ -47,19 +47,19 @@ local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") =
<div class="cbi-value-field">
<div>
<label>
<input class="cbi-input-checkbox" type="checkbox" name="gfwlist" value="1" <%=gfwlist_update%>>
<input class="cbi-input-checkbox" type="checkbox" name="gfwlist" value="1" <%=gfwlist_update%> />
gfwlist
</label>
<label>
<input class="cbi-input-checkbox" type="checkbox" name="chnroute" value="1" <%=chnroute_update%>>
<input class="cbi-input-checkbox" type="checkbox" name="chnroute" value="1" <%=chnroute_update%> />
chnroute
</label>
<label>
<input class="cbi-input-checkbox" type="checkbox" name="chnroute6" value="1" <%=chnroute6_update%>>
<input class="cbi-input-checkbox" type="checkbox" name="chnroute6" value="1" <%=chnroute6_update%> />
chnroute6
</label>
<label>
<input class="cbi-input-checkbox" type="checkbox" name="chnlist" value="1" <%=chnlist_update%>>
<input class="cbi-input-checkbox" type="checkbox" name="chnlist" value="1" <%=chnlist_update%> />
chnlist
</label>
<input class="cbi-button cbi-input-apply" type="button" id="update_rules_btn" onclick="update_rules(this)" value="<%:Manually update%>" />
@ -67,4 +67,4 @@ local chnlist_update = api.uci_get_type("global_rules", "chnlist_update", "1") =
</div>
</div>
</fieldset>
</fieldset>
</fieldset>

1
package/lienol/luci-app-passwall/root/usr/share/passwall/rules/proxy_host
View File

@ -139,6 +139,7 @@ spike.com
srip.net
stripe.com
theplatform.com
tiktok.com
ttvnw.net
turner.com
turnin.com