Makefile

@@ -2,9 +2,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-pushbot
 PKG_VERSION:=3.55
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
-PKG_MAINTAINER:=tty228  zzsj0928
+PKG_MAINTAINER:=tty228 <tty228@yeah.net>  zzsj0928
 
 LUCI_TITLE:=LuCI support for Pushbot
 LUCI_PKGARCH:=all

luasrc/model/cbi/pushbot/client.lua

@@ -2,5 +2,5 @@ f = SimpleForm("pushbot")
 luci.sys.call("/usr/bin/pushbot/pushbot client")
 f.reset = false
 f.submit = false
-f:append(Template("pushbot/client"))
+f:append(Template("pushbot/pushbot_client"))
 return f

luasrc/model/cbi/pushbot/log.lua

 f = SimpleForm("pushbot")
 f.reset = false
 f.submit = false
-f:append(Template("pushbot/log"))
+f:append(Template("pushbot/pushbot_log"))
 return f

root/etc/config/pushbot

@@ -8,4 +8,3 @@ config pushbot 'pushbot'
 	option cpuload_enable '1'
 	option cpuload '2'
 	option temperature_enable '0'
-

root/usr/bin/pushbot/api/ipv4.list

@@ -3,4 +3,4 @@ ipv4.ddnspod.com
 ifcfg.cn
 speed.neu.edu.cn/getIP.php
 ddns.oray.com/checkip
-www.net.cn/static/customercare/yourip.asp
+www.net.cn/static/customercare/yourip.asp
\ No newline at end of file

root/usr/bin/pushbot/api/ipv6.list

@@ -2,4 +2,4 @@ ip.sb
 ipv6.ddnspod.com
 api-ipv6.ip.sb/ip
 speed.neu6.edu.cn/getIP.php
-v6.myip.la/json
+v6.myip.la/json
\ No newline at end of file

root/usr/bin/pushbot/pushbot

@@ -519,7 +519,7 @@ function get_client(){
 		local js_str="${js_str}<div class='th'><%:${tmp_uptime}%></div></div>"
 	done < ${dir}ipAddress
 	fi
-cat>/usr/lib/lua/luci/view/pushbot/client.htm<<EOF
+cat>/usr/lib/lua/luci/view/pushbot/pushbot_client.htm<<EOF
 <h2><%:在线设备列表%></h2><div class="table" id="traffic"><div class="tr table-titles"><div class="th" id="thClient" style="width:17%"><%:客户端名%></div><div class="th" id="thMAC" style="width:10%"><%:MAC%></div><div class="th" id="thIP" style="width:17%"><%:IP%></div><div class="th" id="thTotal" style="width:9%"><%:总计流量%></div><div class="th" id="thFirstSeen" style="width:15%"><%:在线时间%></div></div>
 $js_str
 </div>