update 2023-03-25 23:35:30

This commit is contained in:
github-actions[bot] 2023-03-25 23:35:30 +08:00
parent 4c6b3800e0
commit b60812f329
8 changed files with 48 additions and 25 deletions

View File

@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=186
PKG_RELEASE:=8
PKG_VERSION:=187
PKG_RELEASE:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \

View File

@ -308,12 +308,19 @@ function import_ssr_url(btn, urlname, sid) {
document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = params.get("type") == "http" ? "h2" : params.get("type") || "tcp";
document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event);
document.getElementsByName('cbid.shadowsocksr.' + sid + '.vless_encryption')[0].value = params.get("encryption") || "none";
if ([ "tls" ].includes(params.get("security"))) {
if ([ "tls", "reality" ].includes(params.get("security"))) {
document.getElementsByName('cbid.shadowsocksr.' + sid + '.' + params.get("security"))[0].checked = true;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.' + params.get("security"))[0].dispatchEvent(event);
document.getElementsByName('cbid.shadowsocksr.' + sid + '.fingerprint')[0].value = params.get("fp") || "";
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_flow')[0].value = params.get("flow") || "";
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = params.get("sni") || "";
if (params.get("security") === "reality") {
document.getElementsByName('cbid.shadowsocksr.' + sid + '.reality_publickey')[0].value = params.get("pbk") ? decodeURIComponent(params.get("pbk")) : "";
document.getElementsByName('cbid.shadowsocksr.' + sid + '.reality_shortid')[0].value = params.get("sid") || "";
document.getElementsByName('cbid.shadowsocksr.' + sid + '.reality_spiderx')[0].value = params.get("spx") ? decodeURIComponent(params.get("spx")) : "";
}
}
switch (params.get("type")) {
case "ws":

View File

@ -359,8 +359,12 @@ local function processData(szType, content)
result.transport = params.type or "tcp"
result.tls = (params.security == "tls" or params.security == "xtls") and "1" or "0"
result.tls_host = params.sni
result.tls_flow = (params.security == "tls") and params.flow or nil
result.tls_flow = (params.security == "tls" or params.security == "reality") and params.flow or nil
result.fingerprint = params.fp
result.reality = (params.security == "reality") and "1" or "0"
result.reality_publickey = params.pbk and UrlDecode(params.pbk) or nil
result.reality_shortid = params.sid
result.reality_spiderx = params.spx and UrlDecode(params.spx) or nil
if result.transport == "ws" then
result.ws_host = (result.tls ~= "1") and (params.host and UrlDecode(params.host)) or nil
result.ws_path = params.path and UrlDecode(params.path) or "/"

View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Design Theme
LUCI_DEPENDS:=
PKG_VERSION:=5.5.8
PKG_RELEASE:=20230324
PKG_VERSION:=5.5.9
PKG_RELEASE:=20230325
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -2385,12 +2385,12 @@ header > .container > .pull-right > * {
}
#xhr_poll_status > .label.success {
padding: 10px 0;
padding: 0.7rem 0;
border-radius: 20px;
}
#xhr_poll_status_off {
padding: 10px 0;
padding: 0.7rem 0;
border-radius: 20px;
}
@ -2405,13 +2405,15 @@ header > .container > .pull-right > * {
}
.notice {
background-color: var(--activeColor);
color: #fff;
color: var(--activeColor);
font-size: .8rem;
padding: 2.8px 10px;
/* padding: 0.15rem; */
padding-right: 0.5rem;
border-radius: 10px;
z-index: 10;
top: 22px;
/* top: 1.45rem; */
font-size: 1.8rem;
font-family: design;
}
#refresh_on, #refresh_off {
@ -3023,11 +3025,6 @@ body.lang_pl.node-main-login .cbi-value-title {
select {
width: 100%;
}
.label {
position: absolute;
right: 5px;
top: -70px;
}
header {
height: 55px;
@ -3154,7 +3151,6 @@ body.lang_pl.node-main-login .cbi-value-title {
width: 65%;
}
h2 {
font-size: 1.2rem;
text-transform: capitalize;
@ -3188,7 +3184,6 @@ body.lang_pl.node-main-login .cbi-value-title {
#memcache div div,
#memtotal div div{
}
.node-status-iptables > .main div > .cbi-map > form input[type="submit"]{
margin: 0;
@ -3223,6 +3218,13 @@ body.lang_pl.node-main-login .cbi-value-title {
}
}
@media screen and (max-width: 315px) {
.label {
position: absolute;
right: 5px;
top: -70px;
}
}
/* fix http://192.168.2.1/cgi-bin/luci/admin/nlbw/usage */
#intervalSelect {

File diff suppressed because one or more lines are too long

View File

@ -242,11 +242,21 @@
end
%>
<% if ucichanges > 0 then %>
<a id="notice_status" class="label notice" href="<%=url(category, 'uci/changes')%>?redir=<%=http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/"))%>"><%=translate('Unsaved Changes')%>: <%=ucichanges%></a>
<style>
.notice:after {
content: "<%=ucichanges%>";
font-size: 0.8rem;
font-family: Tahoma;
position: absolute;
top: -5px;
font-weight: normal !important;
}
</style>
<a id="notice_status" class="label notice" href="<%=url(category, 'uci/changes')%>?redir=<%=http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/"))%>">&#xe739;</a>
<% end %>
<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
<span class="label success" id="xhr_poll_status_on"><span id="refresh_on" class="mobile-hide"></span></span>
<span class="label" id="xhr_poll_status_off" style="display:none"><span id="refresh_off" class="mobile-hide"></span></span>
<span class="label success" id="xhr_poll_status_on"><span id="refresh_on" class="mobile-hide">&#xe6b9;</span></span>
<span class="label" id="xhr_poll_status_off" style="display:none"><span id="refresh_off" class="mobile-hide">&#xe6b9;</span></span>
</span>
<% end %>
</div>

View File

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=natflow
PKG_VERSION:=20221225
PKG_VERSION:=20230325
PKG_SOURCE_URL:=https://codeload.github.com/ptpt52/natflow/tar.gz/$(PKG_VERSION)?
PKG_HASH:=c85ddeef4ab2c8edbf5f53e793cb78b55c2663dc010dd5d3d15e428e19ba3917
PKG_HASH:=78ef4af754a83770b7eec1f49a612c19138560615854a24c7595c59225d9836b
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MAINTAINER:=Chen Minqiang <ptpt52@gmail.com>