1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

合并Ysurac/develop的拉取请求#74

sync
This commit is contained in:
suyuan 2021-02-17 23:09:22 +08:00 committed by GitHub
commit c7c62f4516
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 74 additions and 64 deletions

View file

@ -97,7 +97,7 @@
end
if obfs_installed then
%>
<option value="obfs-simple" <% if luci.model.uci.cursor():get("shadowsocks-libev","sss0","obfs_plugin") == "obfs-simple" then %>selected="selected"<% end %>>simple-obfs</option>
<option value="obfs" <% if luci.model.uci.cursor():get("shadowsocks-libev","sss0","obfs_plugin") == "obfs" then %>selected="selected"<% end %>>simple-obfs</option>
<%
end
%>

View file

@ -498,7 +498,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
{
content += String.format('%s %s<br />','<%:whois:%>', whois);
}
if(whois6 !== '')
if(whois6 !== '' && whois6 != whois)
{
content += String.format('%s %s<br />','<%:whois:%>', whois6);
}