From 8baaa0fb65a6f3111ccb8625fbddc1187e3986d9 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Wed, 1 Jan 2020 01:14:47 +0800
Subject: [PATCH] luci-app-filebrowser: optimization

---
 .../luasrc/model/cbi/filebrowser.lua                  | 11 -----------
 .../luci-app-filebrowser/root/etc/init.d/filebrowser  |  6 ++----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/package/ctcgfw/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua b/package/ctcgfw/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua
index 11122db598..bcfa0405ea 100644
--- a/package/ctcgfw/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua
+++ b/package/ctcgfw/luci-app-filebrowser/luasrc/model/cbi/filebrowser.lua
@@ -50,17 +50,6 @@ o.placeholder = "/"
 o.default     = "/"
 o.rmempty     = false
 
-o = s:option(Value, "username", translate("管理员用户名"))
-o.placeholder = "admin"
-o.default     = "admin"
-o.rmempty     = false
-
-o = s:option(Value, "password", translate("管理员密码"))
-o.password    = true
-o.placeholder = "admin"
-o.default     = "admin"
-o.rmempty     = false
-
 o = s:option(Value, "db_dir", translate("数据库目录"))
 o.placeholder = "/etc"
 o.default     = "/etc"
diff --git a/package/ctcgfw/luci-app-filebrowser/root/etc/init.d/filebrowser b/package/ctcgfw/luci-app-filebrowser/root/etc/init.d/filebrowser
index 94aef9c55c..158588be48 100755
--- a/package/ctcgfw/luci-app-filebrowser/root/etc/init.d/filebrowser
+++ b/package/ctcgfw/luci-app-filebrowser/root/etc/init.d/filebrowser
@@ -11,8 +11,6 @@ db_name="$(uci get filebrowser.config.db_name| sed 's#/##g')"
 enabled="$(uci get filebrowser.config.enabled)"
 port="$(uci get filebrowser.config.port)"
 root_dir="$(uci get filebrowser.config.root_dir)"
-username="$(uci get filebrowser.config.username)"
-password="$(filebrowser hash "$(uci get filebrowser.config.password)"| sed 's/$/\$/g')"
 
 if [ "${addr_type}" == "local" ];then
 	addr="127.0.0.1"
@@ -27,9 +25,9 @@ start() {
 	[ "$enabled" == "1" ] || exit 0
 	mkdir -p "${root_dir}"
 	mkdir -p "${db_dir}"
-	filebrowser -a "${addr}" -d "${db_dir}/${db_name}" -p "${port}" -r "${root_dir}" --username "${username}" --password "${password}" >/dev/null 2>&1 &
+	filebrowser -a "${addr}" -d "${db_dir}/${db_name}" -p "${port}" -r "${root_dir}" >/dev/null 2>&1 &
 }
 
 stop() {
-	killall filebrowser >/dev/null 2>&1
+	killall -9 filebrowser >/dev/null 2>&1
 }