fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-serverchan: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-01-19 11:37:11 +08:00
parent bd26ff2641
commit 18a277a521
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/luci-app-serverchan/Makefile
View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for serverchan
LUCI_DEPENDS:=+iputils-arping +curl
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-serverchan
PKG_VERSION:=1.26
PKG_VERSION:=1.27
PKG_RELEASE:=42
include $(TOPDIR)/feeds/luci/luci.mk

4
package/ctcgfw/luci-app-serverchan/luasrc/model/cbi/serverchan.lua
View File

@ -31,6 +31,10 @@ a.rmempty=true
a=s:taboption("tab_basic", Value,"sckey",translate('SCKEY'))
a.rmempty=true
device_name=s:taboption("tab_basic", Value,"device_name",translate('本设备名称'))
device_name.rmempty=true
device_name.description = translate("在推送信息标题中会标识本设备名称，用于区分推送信息的来源设备")
debuglevel=s:taboption("tab_basic", ListValue,"debuglevel",translate("日志调试等级"))
debuglevel:value("",translate("关闭"))
debuglevel:value("1",translate("简单"))

3
package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan
View File

@ -48,6 +48,7 @@ function read_config(){
cpuload=`get_config cpuload`
temperature_enable=`get_config temperature_enable`
temperature=`get_config temperature`
device_name=`get_config device_name`
dir="/tmp/serverchan/"
}
@ -537,6 +538,7 @@ function send(){
send_content=${send_content}"`cat ${dir}ipAddress | grep "$ip" | awk '{print $3}' | grep -v "^$" | sort -u`%0D%0A%0D%0A"" 总计流量：$ip_total 在线 $time1"
done
fi
if [ ! -z "$device_name" ] ; then send_title="【$device_name】$send_title" ;fi
send_title=$( echo $send_title | sed $'s/\ /%20/g'| sed $'s/\"/%22/g'| sed $'s/\#/%23/g'| sed $'s/\&/%26/g'| sed $'s/\,/%2C/g'| sed $'s/\//%2F/g'| sed $'s/\:/%3A/g'| sed $'s/\;/%3B/g'| sed $'s/\=/%3D/g'| sed $'s/\@/%40/g')
content=$( echo $content| sed $'s/unknown/%e6%9c%aa%e7%9f%a5%e8%ae%be%e5%a4%87/')
#send_content=$( echo $send_content | sed $'s/\ /%20/g'| sed $'s/\"/%22/g'| sed $'s/\#/%23/g'| sed $'s/\&/%26/g'| sed $'s/\,/%2C/g'| sed $'s/\//%2F/g'| sed $'s/\:/%3A/g'| sed $'s/\;/%3B/g'| sed $'s/\=/%3D/g'| sed $'s/\@/%40/g')
@ -977,6 +979,7 @@ function serverchan_send(){
if [ -f "${dir}content" ] ; then content=`cat ${dir}content` ;fi
if [ ! -z "$title" ] && [ ! -z "$content" ] ; then
nowtime=`date "+%Y-%m-%d %H:%M:%S"`
if [ ! -z "$device_name" ] ; then title="【$device_name】$title" ;fi
title=$( echo $title | sed $'s/\ /%20/g'| sed $'s/\"/%22/g'| sed $'s/\#/%23/g'| sed $'s/\&/%26/g'| sed $'s/\,/%2C/g'| sed $'s/\//%2F/g'| sed $'s/\:/%3A/g'| sed $'s/\;/%3B/g'| sed $'s/\=/%3D/g'| sed $'s/\@/%40/g')
content=$( echo $content| sed $'s/unknown/%e6%9c%aa%e7%9f%a5%e8%ae%be%e5%a4%87/')
if [ ! -z "$debuglevel" ] && [ "$debuglevel" -ne "1" ] ; then echo "`date "+%H:%M:%S"` 进行 URL 编码，标题=$title" >> ${logfile};fi