From b16d0661b00434c89a4d3d030d1a7b02b5b2c1c0 Mon Sep 17 00:00:00 2001
From: caicaicai21 <caicaicai21@outlook.com>
Date: Wed, 4 Mar 2020 14:43:51 +0800
Subject: [PATCH] luci-app-v2ray-server: fix bugs (#3531)

---
 .../luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua  | 8 ++++----
 .../luasrc/model/cbi/v2ray_server/index.lua               | 2 ++
 .../lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po   | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua
index d7b2fa0e1..6b632ee76 100644
--- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua
+++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/api/genv2rayconfig.lua
@@ -36,10 +36,10 @@ elseif server.protocol == "http" then
         allowTransparent = false,
         accounts = {
             {
-                user = (server.socks_username == nil) and "" or
-                    server.socks_username,
-                pass = (server.socks_password == nil) and "" or
-                    server.socks_password
+                user = (server.http_username == nil) and "" or
+                    server.http_username,
+                pass = (server.http_password == nil) and "" or
+                    server.http_password
             }
         }
     }
diff --git a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/index.lua b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/index.lua
index 5bb2ea59d..395a0f31e 100644
--- a/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/index.lua
+++ b/package/lean/luci-app-v2ray-server/luasrc/model/cbi/v2ray_server/index.lua
@@ -87,6 +87,8 @@ e.cfgvalue = function(self, section)
         e = "ss_password"
     elseif protocol == "socks" then
         e = "socks_password"
+    elseif protocol == "http" then
+        e = "http_password"
     end
     local e = m:get(section, e) or ""
     local t = ""
diff --git a/package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po b/package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po
index 1a225131b..04f531278 100644
--- a/package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po
+++ b/package/lean/luci-app-v2ray-server/po/zh-cn/v2ray_server.po
@@ -22,6 +22,9 @@ msgstr "当勾选时，只能由本机访问此端口，当开启反向代理时
 msgid "Port"
 msgstr "端口"
 
+msgid "User name"
+msgstr "用户名"
+
 msgid "Password"
 msgstr "密码"