luci-app-koolproxyR: sync with upstream source

package/ctcgfw/luci-app-koolproxyR/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-koolproxyR
 PKG_VERSION:=3.8.4
-PKG_RELEASE:=5
+PKG_RELEASE:=20200228-4
 
 PKG_MAINTAINER:=panda-mute <wxuzju@gmail.com>
 PKG_LICENSE:=GPLv3

package/ctcgfw/luci-app-koolproxyR/files/etc/config/koolproxy

@@ -1,3 +1,4 @@
+
 config global
 	option time_update '4'
 	option koolproxy_port '0'
@@ -9,9 +10,9 @@ config global
 	option koolproxy_acl_default '3'
 
 config rss_rule
-	option load '1'
 	option name 'kpr_our_rule.txt'
 	option url 'https://github.com/user1121114685/koolproxyR_rule_list/raw/master/kpr_our_rule.txt'
 	option file 'kpr_our_rule.txt'
 	option load '0'
 
+

package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua

@@ -214,7 +214,7 @@ t:tab("iplist",translate("IP黑名单设置"))
 
 local i = "/etc/adblocklist/adblockip"
 e = t:taboption("iplist", TextValue, "adblock_ip")
-e.description = translate("这些已经加入的ip地址不会使用filter.Please输入ip地址或ip地址段，每行只能输入一个ip地址。例如，112.123.134.145 / 24或112.123.134.145。")
+e.description = translate("这些已经加入的ip地址不会使用过滤器。请输入ip地址或ip地址段，每行只能输入一个ip地址。例如，112.123.134.145 / 24或112.123.134.145。")
 e.rows = 28
 e.wrap = "off"
 e.rmempty = false
@@ -387,30 +387,10 @@ function(o,a,i)
 end
 )
 
-t=o:section(TypedSection,"rss_rule",translate("Technical Support"),translate("本软件由KPR提供技术支持"))
+t=o:section(TypedSection,"rss_rule",translate("技术支持"),translate("本软件由KPR提供技术支持"))
 
 t.anonymous = true
 
-e=t:option(Button, "webe")
-e.title = translate("koolproxyR开源项目")
-e.inputtitle = translate("点击前往")
-e.inputstyle = "apply"
-e.write = function()
-	luci.http.redirect("https://github.com/user1121114685/koolproxyR")
-end
-e=t:option(Button, "web")
-e.title = translate("koolproxyR使用说明")
-e.inputtitle = translate("点击前往")
-e.inputstyle = "apply"
-e.write = function()
-	luci.http.redirect("https://shaoxia.xyz/post/koolproxyr%E6%8C%87%E5%8D%97/")
-end
-e=t:option(Button, "Donate")
-e.title = translate("koolproxyR交流群")
-e.inputtitle = translate("加入telegram群")
-e.inputstyle = "apply"
-e.write = function()
-	luci.http.redirect("https://t.me/koolproxyR")
-end
+t:append(Template("koolproxy/feedback"))
 
 return o

package/ctcgfw/luci-app-koolproxyR/files/usr/lib/lua/luci/view/koolproxy/feedback.htm

@@ -0,0 +1,21 @@
+
+</style>
+
+            <div class="cbi-value">
+			<label class="cbi-value-title">koolproxyR 交流群</label>
+			<div class="cbi-value-field">
+				<input type="button" class="cbi-button cbi-input-reload" value="点击前往" onclick="javascript:window.open('https://t.me/koolproxyR','target');" />
+			</div>
+		</div>
+	
+	   <div class="cbi-value">
+			<label class="cbi-value-title">KoolProxyR plus+ 交流群</label>
+			<div class="cbi-value-field">
+				<input type="button" class="cbi-button cbi-input-reload" value="点击前往" onclick="javascript:window.open('https://t.me/joinchat/IBxysRUIgFq7pujqqZLc6Q','target');" />
+			</div>
+		</div>
+	
+                         
+		
+	</fieldset>
+</fieldset>