From 9f048c5e383ffa2699d7c2ba9b51cf2a7bbf4c50 Mon Sep 17 00:00:00 2001
From: 505575853 <31321865+505575853@users.noreply.github.com>
Date: Wed, 14 Nov 2018 19:52:56 +0800
Subject: [PATCH] luci ssr plus: adjustment configuration

---
 .../model/cbi/shadowsocksr/client-config.lua  | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index b5c553b30..31c96866c 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -121,9 +121,6 @@ o.template = "shadowsocksr/ssrurl"
 o.value =sid
 o:depends("type", "ssr")
 
-o = s:option(Value, "alias", translate("Alias(optional)"))
-
-
 o = s:option(ListValue, "type", translate("Server Node Type"))
 o:value("ssr", translate("ShadowsocksR"))
 if nixio.fs.access("/usr/bin/ss-redir") then
@@ -134,7 +131,7 @@ o:value("v2ray", translate("V2Ray"))
 end
 o.description = translate("Using incorrect encryption mothod may causes service fail to start")
 
-
+o = s:option(Value, "alias", translate("Alias(optional)"))
 
 o = s:option(Value, "server", translate("Server Address"))
 o.datatype = "host"
@@ -151,23 +148,23 @@ o.rmempty = false
 
 o = s:option(Value, "password", translate("Password"))
 o.password = true
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "ssr")
 o:depends("type", "ss")
 
 o = s:option(ListValue, "encrypt_method", translate("Encrypt Method"))
 for _, v in ipairs(encrypt_methods) do o:value(v) end
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "ssr")
 
 o = s:option(ListValue, "encrypt_method_ss", translate("Encrypt Method"))
 for _, v in ipairs(encrypt_methods_ss) do o:value(v) end
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "ss")
 
 o = s:option(ListValue, "protocol", translate("Protocol"))
 for _, v in ipairs(protocol) do o:value(v) end
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "ssr")
 
 o = s:option(Value, "protocol_param", translate("Protocol param(optional)"))
@@ -175,7 +172,7 @@ o:depends("type", "ssr")
 
 o = s:option(ListValue, "obfs", translate("Obfs"))
 for _, v in ipairs(obfs) do o:value(v) end
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "ssr")
 
 o = s:option(Value, "obfs_param", translate("Obfs param(optional)"))
@@ -185,74 +182,74 @@ o:depends("type", "ssr")
 o = s:option(Value, "alter_id", translate("AlterId"))
 o.datatype = "port"
 o.default = 16
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "v2ray")
 
 -- VmessId
 o = s:option(Value, "vmess_id", translate("VmessId (UUID)"))
-o.rmempty = false
+o.rmempty = true
 o.default = uuid
 o:depends("type", "v2ray")
 
--- 加密方式
+-- 鍔犲瘑鏂瑰紡
 o = s:option(ListValue, "security", translate("Encrypt Method"))
 for _, v in ipairs(securitys) do o:value(v, v:upper()) end
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "v2ray")
 
--- 传输协议
+-- 浼犺緭鍗忚
 o = s:option(ListValue, "transport", translate("Transport"))
 o:value("tcp", "TCP")
 o:value("kcp", "mKCP")
 o:value("ws", "WebSocket")
 o:value("h2", "HTTP/2")
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "v2ray")
 
--- [[ TCP部分 ]]--
+-- [[ TCP閮ㄥ垎 ]]--
 
--- TCP伪装
+-- TCP浼
 o = s:option(ListValue, "tcp_guise", translate("Camouflage Type"))
 o:depends("transport", "tcp")
 o:value("none", translate("None"))
 o:value("http", "HTTP")
 o.rmempty = true
 
--- HTTP域名
+-- HTTP鍩熷悕
 o = s:option(DynamicList, "http_host", translate("HTTP Host"))
 o:depends("tcp_guise", "http")
 o.rmempty = true
 
--- HTTP路径
+-- HTTP璺緞
 o = s:option(DynamicList, "http_path", translate("HTTP Path"))
 o:depends("tcp_guise", "http")
 o.rmempty = true
 
--- [[ WS部分 ]]--
+-- [[ WS閮ㄥ垎 ]]--
 
--- WS域名
+-- WS鍩熷悕
 o = s:option(Value, "ws_host", translate("WebSocket Host"))
 o:depends("transport", "ws")
 o.rmempty = true
 
--- WS路径
+-- WS璺緞
 o = s:option(Value, "ws_path", translate("WebSocket Path"))
 o:depends("transport", "ws")
 o.rmempty = true
 
--- [[ H2部分 ]]--
+-- [[ H2閮ㄥ垎 ]]--
 
--- H2域名
+-- H2鍩熷悕
 o = s:option(DynamicList, "h2_host", translate("HTTP/2 Host"))
 o:depends("transport", "h2")
 o.rmempty = true
 
--- H2路径
+-- H2璺緞
 o = s:option(Value, "h2_path", translate("HTTP/2 Path"))
 o:depends("transport", "h2")
 o.rmempty = true
 
--- [[ mKCP部分 ]]--
+-- [[ mKCP閮ㄥ垎 ]]--
 
 o = s:option(ListValue, "kcp_guise", translate("Camouflage Type"))
 o:depends("transport", "kcp")
@@ -306,21 +303,23 @@ o.rmempty = true
 
 -- [[ allowInsecure ]]--
 o = s:option(Flag, "insecure", translate("allowInsecure"))
-o.rmempty = false
+o.rmempty = true
 o:depends("type", "v2ray")
 
 -- [[ TLS ]]--
 o = s:option(Flag, "tls", translate("TLS"))
-o.rmempty = false
+o.rmempty = true
+o.default = "0"
 o:depends("type", "v2ray")
 
 -- [[ Mux ]]--
 o = s:option(Flag, "mux", translate("Mux"))
-o.rmempty = false
+o.rmempty = true
+o.default = "0"
 o:depends("type", "v2ray")
 
 o = s:option(Flag, "fast_open", translate("TCP Fast Open"))
-o.rmempty = false
+o.rmempty = true
 o.default = "0"
 o:depends("type", "ssr")
 o:depends("type", "ss")
@@ -337,7 +336,8 @@ o.rmempty = false
 if nixio.fs.access("/usr/bin/ssr-kcptun") then
 
 kcp_enable = s:option(Flag, "kcp_enable", translate("KcpTun Enable"), translate("bin:/usr/bin/ssr-kcptun"))
-kcp_enable.rmempty = false
+kcp_enable.rmempty = true
+kcp_enable.default = "0"
 kcp_enable:depends("type", "ssr")
 kcp_enable:depends("type", "ss")