update 2023-05-01 16:22:51
This commit is contained in:
parent
7e8ec0c6f9
commit
42d9387a0a
|
@ -5,7 +5,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-passwall2
|
PKG_NAME:=luci-app-passwall2
|
||||||
PKG_VERSION:=1.13-4
|
PKG_VERSION:=1.13-5
|
||||||
PKG_RELEASE:=
|
PKG_RELEASE:=
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS:= \
|
PKG_CONFIG_DEPENDS:= \
|
||||||
|
|
|
@ -350,7 +350,7 @@ run_v2ray() {
|
||||||
ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $V2RAY_DNS_DIRECT_LOG run -c "$V2RAY_DNS_DIRECT_CONFIG"
|
ln_run "$(first_type $(config_t_get global_app ${type}_file) ${type})" ${type} $V2RAY_DNS_DIRECT_LOG run -c "$V2RAY_DNS_DIRECT_CONFIG"
|
||||||
|
|
||||||
direct_dnsmasq_listen_port=$(get_new_port $(expr $dns_direct_listen_port + 1) udp)
|
direct_dnsmasq_listen_port=$(get_new_port $(expr $dns_direct_listen_port + 1) udp)
|
||||||
run_direct_ipset_dnsmasq listen_port=${direct_dnsmasq_listen_port} server_dns=127.0.0.1#${dns_direct_listen_port} ipset=whitelist,whitelist6 config_file=$TMP_PATH/dnsmasq_${flag}_direct.conf
|
run_ipset_dnsmasq listen_port=${direct_dnsmasq_listen_port} server_dns=127.0.0.1#${dns_direct_listen_port} ipset=whitelist,whitelist6 config_file=$TMP_PATH/dnsmasq_${flag}_direct.conf
|
||||||
|
|
||||||
V2RAY_DNS_REMOTE_CONFIG="${TMP_PATH}/${flag}_dns_remote.json"
|
V2RAY_DNS_REMOTE_CONFIG="${TMP_PATH}/${flag}_dns_remote.json"
|
||||||
V2RAY_DNS_REMOTE_LOG="${TMP_PATH}/${flag}_dns_remote.log"
|
V2RAY_DNS_REMOTE_LOG="${TMP_PATH}/${flag}_dns_remote.log"
|
||||||
|
@ -776,12 +776,14 @@ stop_crontab() {
|
||||||
#echolog "清除定时执行命令。"
|
#echolog "清除定时执行命令。"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_direct_ipset_dnsmasq() {
|
run_ipset_dnsmasq() {
|
||||||
local listen_port server_dns ipset config_file
|
local listen_port server_dns ipset config_file
|
||||||
eval_set_val $@
|
eval_set_val $@
|
||||||
echo "port=${listen_port}" >> $config_file
|
cat <<-EOF > $config_file
|
||||||
echo "server=${server_dns}" >> $config_file
|
port=${listen_port}
|
||||||
echo "ipset=${ipset}" >> $config_file
|
server=${server_dns}
|
||||||
|
ipset=${ipset}
|
||||||
|
EOF
|
||||||
ln_run "$(first_type dnsmasq)" "dnsmasq" "/dev/null" -C $config_file
|
ln_run "$(first_type dnsmasq)" "dnsmasq" "/dev/null" -C $config_file
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-serverchan
|
PKG_NAME:=luci-app-serverchan
|
||||||
PKG_VERSION:=2.05.0
|
PKG_VERSION:=2.05.1
|
||||||
PKG_RELEASE:=10
|
PKG_RELEASE:=10
|
||||||
|
|
||||||
PKG_MAINTAINER:=tty228 <tty228@yeah.net>
|
PKG_MAINTAINER:=tty228 <tty228@yeah.net>
|
||||||
|
|
|
@ -50,6 +50,7 @@ function read_config(){
|
||||||
str_splitline=`jq -r '.str_splitline' ${jsonpath}`
|
str_splitline=`jq -r '.str_splitline' ${jsonpath}`
|
||||||
str_space=`jq -r '.str_space' ${jsonpath}`
|
str_space=`jq -r '.str_space' ${jsonpath}`
|
||||||
str_tab=`jq -r '.str_tab' ${jsonpath}`
|
str_tab=`jq -r '.str_tab' ${jsonpath}`
|
||||||
|
disturb_text=`jq -r '._api' ${jsonpath}`
|
||||||
( echo "$lite_enable"|grep -q "content" ) && str_title_start="" && str_title_end="" && str_splitline="" && str_linefeed="" && str_tab=""
|
( echo "$lite_enable"|grep -q "content" ) && str_title_start="" && str_title_end="" && str_splitline="" && str_linefeed="" && str_tab=""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,7 +529,7 @@ function serverchan_cron(){
|
||||||
function serverchan_disturb(){
|
function serverchan_disturb(){
|
||||||
[ -z "$serverchan_sheep" ] || [ -z "$starttime" ] || [ -z "$endtime" ] && return 0
|
[ -z "$serverchan_sheep" ] || [ -z "$starttime" ] || [ -z "$endtime" ] && return 0
|
||||||
|
|
||||||
# 非免打扰
|
# 非免打扰时间
|
||||||
if [ `date +%H` -ge $endtime -a $starttime -lt $endtime ] || [ `date +%H` -lt $starttime -a $starttime -lt $endtime ] || [ `date +%H` -lt $starttime -a `date +%H` -ge $endtime -a $starttime -gt $endtime ]; then
|
if [ `date +%H` -ge $endtime -a $starttime -lt $endtime ] || [ `date +%H` -lt $starttime -a $starttime -lt $endtime ] || [ `date +%H` -lt $starttime -a `date +%H` -ge $endtime -a $starttime -gt $endtime ]; then
|
||||||
unset sheep_starttime
|
unset sheep_starttime
|
||||||
rm -f ${dir}sheep_usage ${dir}old_sheep_usage 2>/dev/null
|
rm -f ${dir}sheep_usage ${dir}old_sheep_usage 2>/dev/null
|
||||||
|
@ -1074,7 +1075,7 @@ function login_send(){
|
||||||
add_ip_white ${login_ip}
|
add_ip_white ${login_ip}
|
||||||
local web_login_time=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1`
|
local web_login_time=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1`
|
||||||
local web_login_mode=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $3}'|grep -v "^$"|sort -u|head -n1`
|
local web_login_mode=`cat ${dir}web_login|grep -w ${login_ip}|awk '{print $3}'|grep -v "^$"|sort -u|head -n1`
|
||||||
echo "$ip_white_list"|grep -w -q "$login_ip" && echo "${web_login_time} 【info】设备 ${login_ip} 通过 Web ${web_login_mode} 登陆了路由器 " >> ${logfile} && continue
|
echo "$ip_white_list"|grep -w -q "$login_ip" && echo "`date "+%Y-%m-%d"` ${web_login_time} 【info】设备 ${login_ip} 通过 Web ${web_login_mode} 登陆了路由器 " >> ${logfile} && continue
|
||||||
if [ ! -z "$web_logged" ] && [ "$web_logged" -eq "1" ]; then
|
if [ ! -z "$web_logged" ] && [ "$web_logged" -eq "1" ]; then
|
||||||
if [ -z "$title" ]; then
|
if [ -z "$title" ]; then
|
||||||
title="${login_ip} 通过 Web 登陆了路由器"
|
title="${login_ip} 通过 Web 登陆了路由器"
|
||||||
|
@ -1089,7 +1090,7 @@ function login_send(){
|
||||||
fi
|
fi
|
||||||
sed -i "/^${login_ip}$/d" ${dir}ssh_failed
|
sed -i "/^${login_ip}$/d" ${dir}ssh_failed
|
||||||
sed -i "/^${login_ip}$/d" ${dir}web_failed
|
sed -i "/^${login_ip}$/d" ${dir}web_failed
|
||||||
echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}设备 ${login_ip} 通过 Web ${web_login_mode} 登陆了路由器 " >> ${logfile}
|
echo "`date "+%Y-%m-%d"` ${web_login_time} ${disturb_text}设备 ${login_ip} 通过 Web ${web_login_mode} 登陆了路由器 " >> ${logfile}
|
||||||
done
|
done
|
||||||
echo "" > ${dir}web_login
|
echo "" > ${dir}web_login
|
||||||
unset login_ip login_ip_list
|
unset login_ip login_ip_list
|
||||||
|
@ -1100,7 +1101,7 @@ function login_send(){
|
||||||
add_ip_white ${login_ip}
|
add_ip_white ${login_ip}
|
||||||
local ssh_login_time=`cat ${dir}ssh_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1`
|
local ssh_login_time=`cat ${dir}ssh_login|grep -w ${login_ip}|awk '{print $1}'|grep -v "^$"|sort -u|head -n1`
|
||||||
local ssh_login_mode=`cat ${dir}ssh_login|grep -w ${login_ip}|awk '{print $3}'|grep -v "^$"|sort -u|head -n1`
|
local ssh_login_mode=`cat ${dir}ssh_login|grep -w ${login_ip}|awk '{print $3}'|grep -v "^$"|sort -u|head -n1`
|
||||||
echo "$ip_white_list"|grep -w -q "$login_ip" && echo "${ssh_login_time} 【info】设备 ${login_ip} 通过 SSH ${ssh_login_mode} 登陆了路由器 " >> ${logfile} && continue
|
echo "$ip_white_list"|grep -w -q "$login_ip" && echo "`date "+%Y-%m-%d"` ${web_login_time} 【info】设备 ${login_ip} 通过 SSH ${ssh_login_mode} 登陆了路由器 " >> ${logfile} && continue
|
||||||
[ ! -z "$ssh_login_mode" ] && local content_mode="${str_linefeed}${str_tab}登录方式: ${str_space}${str_space}${str_space}${str_space}${ssh_login_mode}"
|
[ ! -z "$ssh_login_mode" ] && local content_mode="${str_linefeed}${str_tab}登录方式: ${str_space}${str_space}${str_space}${str_space}${ssh_login_mode}"
|
||||||
if [ ! -z "$ssh_logged" ] && [ "$ssh_logged" -eq "1" ]; then
|
if [ ! -z "$ssh_logged" ] && [ "$ssh_logged" -eq "1" ]; then
|
||||||
if [ -z "$title" ]; then
|
if [ -z "$title" ]; then
|
||||||
|
@ -1115,7 +1116,7 @@ function login_send(){
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
sed -i "/^${login_ip}$/d" ${dir}ssh_failed
|
sed -i "/^${login_ip}$/d" ${dir}ssh_failed
|
||||||
echo "`date "+%Y-%m-%d %H:%M:%S"` ${disturb_text}设备 ${login_ip} 通过 SSH ${ssh_login_mode} 登陆了路由器 " >> ${logfile}
|
echo "`date "+%Y-%m-%d"` ${web_login_time} ${disturb_text}设备 ${login_ip} 通过 SSH ${ssh_login_mode} 登陆了路由器 " >> ${logfile}
|
||||||
done
|
done
|
||||||
echo "" > ${dir}ssh_login
|
echo "" > ${dir}ssh_login
|
||||||
unset login_ip login_ip_list
|
unset login_ip login_ip_list
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright 2020-2022 Rafał Wabik - IceG - From eko.one.pl forum
|
# Copyright 2020-2023 Rafał Wabik - IceG - From eko.one.pl forum
|
||||||
# Licensed to the GNU General Public License v3.0.
|
# Licensed to the GNU General Public License v3.0.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ LUCI_TITLE:=LuCI Support for sms-tool
|
||||||
LUCI_DESCRIPTION:=LuCI interface for the sms-tool. The user interface supports SMS/USSD Codes/AT Commands.
|
LUCI_DESCRIPTION:=LuCI interface for the sms-tool. The user interface supports SMS/USSD Codes/AT Commands.
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
LUCI_DEPENDS:=+sms-tool +kmod-usb-serial +kmod-usb-serial-option +comgt
|
LUCI_DEPENDS:=+sms-tool +kmod-usb-serial +kmod-usb-serial-option +comgt
|
||||||
PKG_VERSION:=1.9.5-20221207
|
PKG_VERSION:=1.9.6-20230501
|
||||||
|
|
||||||
include $(TOPDIR)/feeds/luci/luci.mk
|
include $(TOPDIR)/feeds/luci/luci.mk
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
-- Copyright 2020-2022 Rafa³ Wabik (IceG) - From eko.one.pl forum
|
-- Copyright 2020-2023 Rafa<66> Wabik (IceG) - From eko.one.pl forum
|
||||||
-- Licensed to the GNU General Public License v3.0.
|
-- Licensed to the GNU General Public License v3.0.
|
||||||
|
|
||||||
local util = require "luci.util"
|
local util = require "luci.util"
|
||||||
|
@ -68,6 +68,20 @@ mem.rmempty = true
|
||||||
local msm = s:taboption(this_tab, Flag, "mergesms", translate("Merge split messages"), translate("Checking this option will make it easier to read the messages, but it will cause a discrepancy in the number of messages shown and received."))
|
local msm = s:taboption(this_tab, Flag, "mergesms", translate("Merge split messages"), translate("Checking this option will make it easier to read the messages, but it will cause a discrepancy in the number of messages shown and received."))
|
||||||
msm.rmempty = false
|
msm.rmempty = false
|
||||||
|
|
||||||
|
msma = s:taboption(this_tab, ListValue, "algorithm", translate("Merge algorithm"), translate(""))
|
||||||
|
msma.default = "Simple"
|
||||||
|
msma:value("Simple", translate("Simple (merge without sorting)"))
|
||||||
|
msma:value("Advanced", translate("Advanced (merges with sorting)"))
|
||||||
|
msma:depends("mergesms", "1")
|
||||||
|
msma.rmempty = true
|
||||||
|
|
||||||
|
msmd = s:taboption(this_tab, ListValue, "direction", translate("Direction of message merging"), translate(""))
|
||||||
|
msmd.default = "Start"
|
||||||
|
msmd:value("Start", translate("From beginning to end"))
|
||||||
|
msmd:value("End", translate("From end to beginning"))
|
||||||
|
msmd:depends("algorithm", "Advanced")
|
||||||
|
msmd.rmempty = true
|
||||||
|
|
||||||
dev2 = s:taboption(this_tab, Value, "sendport", translate("SMS Sending Port"))
|
dev2 = s:taboption(this_tab, Value, "sendport", translate("SMS Sending Port"))
|
||||||
if try_devices2 then
|
if try_devices2 then
|
||||||
local node
|
local node
|
||||||
|
|
|
@ -10,11 +10,14 @@
|
||||||
local smsmem = tostring(uci:get("sms_tool", "general", "storage"))
|
local smsmem = tostring(uci:get("sms_tool", "general", "storage"))
|
||||||
local sms = tostring(luci.sys.exec("sms_tool -s" .. smsmem .. " -d " .. devv .. " -f '%Y-%m-%d %H:%M' -j recv 2>/dev/null"))
|
local sms = tostring(luci.sys.exec("sms_tool -s" .. smsmem .. " -d " .. devv .. " -f '%Y-%m-%d %H:%M' -j recv 2>/dev/null"))
|
||||||
local smsmer = tostring(uci:get("sms_tool", "general", "mergesms"))
|
local smsmer = tostring(uci:get("sms_tool", "general", "mergesms"))
|
||||||
|
local directx = tostring(uci:get("sms_tool", "general", "direction"))
|
||||||
|
local algox = tostring(uci:get("sms_tool", "general", "algorithm"))
|
||||||
local smscuta = string.sub (sms, 8)
|
local smscuta = string.sub (sms, 8)
|
||||||
local smscut = smscuta:sub(1, #smscuta - 2)
|
local smscut = smscuta:sub(1, #smscuta - 2)
|
||||||
local statusb = luci.util.exec("sms_tool -s" .. smsmem .. " -d ".. devv .. " status")
|
local statusb = luci.util.exec("sms_tool -s" .. smsmem .. " -d ".. devv .. " status")
|
||||||
local all = statusb:match('[^: ]+$')
|
local all = statusb:match('[^: ]+$')
|
||||||
local location = ""
|
local location = ""
|
||||||
|
|
||||||
local l = string.sub (statusb, 15, 16)
|
local l = string.sub (statusb, 15, 16)
|
||||||
if l == "SM" then
|
if l == "SM" then
|
||||||
location = translate("SIM card")
|
location = translate("SIM card")
|
||||||
|
@ -27,7 +30,7 @@
|
||||||
<%+header%>
|
<%+header%>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
-- Copyright 2020-2022 Rafał Wabik (IceG) - From eko.one.pl forum
|
-- Copyright 2020-2023 Rafał Wabik (IceG) - From eko.one.pl forum
|
||||||
-- Licensed to the GNU General Public License v3.0.
|
-- Licensed to the GNU General Public License v3.0.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
@ -72,6 +75,9 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
|
||||||
);
|
);
|
||||||
|
|
||||||
var msgm = <%=smsmer%>;
|
var msgm = <%=smsmer%>;
|
||||||
|
var algo = "<%=algox%>";
|
||||||
|
var direct = "<%=directx%>";
|
||||||
|
|
||||||
if ( msgm == "0" ) {
|
if ( msgm == "0" ) {
|
||||||
|
|
||||||
var array = <%=smscut%>;
|
var array = <%=smscut%>;
|
||||||
|
@ -97,6 +103,8 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
|
||||||
|
|
||||||
if ( msgm == "1" ) {
|
if ( msgm == "1" ) {
|
||||||
|
|
||||||
|
if (algo == 'Simple') {
|
||||||
|
|
||||||
var array = <%=smscut%>;
|
var array = <%=smscut%>;
|
||||||
var sortedData = array .sort((function (a, b) { return new Date(b.timestamp) - new Date(a.timestamp) }));
|
var sortedData = array .sort((function (a, b) { return new Date(b.timestamp) - new Date(a.timestamp) }));
|
||||||
var table = document.getElementById("smsTable");
|
var table = document.getElementById("smsTable");
|
||||||
|
@ -106,34 +114,79 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
|
||||||
|
|
||||||
MergeMySMS.forEach(function (o) {
|
MergeMySMS.forEach(function (o) {
|
||||||
if (!this[o.sender]) {
|
if (!this[o.sender]) {
|
||||||
if(o.part > 0){
|
|
||||||
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content, contentparts: [] };
|
|
||||||
this[o.sender].contentparts[o.part] = o.content;
|
|
||||||
}else{
|
|
||||||
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
|
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
|
||||||
}
|
|
||||||
result.push(this[o.sender]);
|
result.push(this[o.sender]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this[o.sender].total == o.total && this[o.sender].timestamp == o.timestamp && this[o.sender].sender == o.sender && this[o.sender].part > 0) {
|
if (this[o.sender].total == o.total && this[o.sender].part > 0) {
|
||||||
this[o.sender].index += '-' + o.index;
|
this[o.sender].content += o.content;
|
||||||
this[o.sender].contentparts[o.part] = o.content;}
|
this[o.sender].index += '-' + o.index;}
|
||||||
else {
|
else {
|
||||||
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
|
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
|
||||||
result.push(this[o.sender]);
|
result.push(this[o.sender]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}, Object.create(null));
|
}, Object.create(null));
|
||||||
result.forEach(function(o) {
|
|
||||||
if(o.contentparts){
|
|
||||||
o.contentparts.shift();
|
|
||||||
o.content = o.contentparts.join('');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
var data = JSON.stringify(result);
|
var data = JSON.stringify(result);
|
||||||
var json = JSON.parse(data);
|
var json = JSON.parse(data);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (algo == 'Advanced') {
|
||||||
|
|
||||||
|
var array = <%=smscut%>;
|
||||||
|
var table = document.getElementById("smsTable");
|
||||||
|
|
||||||
|
result = [];
|
||||||
|
|
||||||
|
switch (direct) {
|
||||||
|
case 'Start':
|
||||||
|
var Data = array.sort((a, b) => {
|
||||||
|
if (a.timestamp === b.timestamp && a.sender === b.sender) {
|
||||||
|
return a.part - b.part;
|
||||||
|
} else if (a.timestamp === b.timestamp) {
|
||||||
|
return a.sender - b.sender;
|
||||||
|
} else {
|
||||||
|
return a.timestamp.localeCompare(b.timestamp);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case 'End':
|
||||||
|
var Data = array.sort((a, b) => {
|
||||||
|
if (a.timestamp === b.timestamp && a.sender === b.sender) {
|
||||||
|
return b.part - a.part;
|
||||||
|
} else if (a.timestamp === b.timestamp) {
|
||||||
|
return a.sender - b.sender;
|
||||||
|
} else {
|
||||||
|
return a.timestamp.localeCompare(b.timestamp);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
|
var SortedSMS = Data.sort((function (a, b) { return new Date(b.timestamp) - new Date(a.timestamp) }));
|
||||||
|
|
||||||
|
var combinedjson = {};
|
||||||
|
|
||||||
|
for (const parts of SortedSMS) {
|
||||||
|
const { sender, timestamp, total, content, index } = parts;
|
||||||
|
const key = `${sender}-${timestamp}-${total}`;
|
||||||
|
if (combinedjson[key]) {
|
||||||
|
combinedjson[key].content += content;
|
||||||
|
combinedjson[key].index += '-'+index;
|
||||||
|
} else {
|
||||||
|
combinedjson[key] = { sender, timestamp, total, content, index };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var result = Object.values(combinedjson);
|
||||||
|
|
||||||
|
var data = JSON.stringify(result);
|
||||||
|
var json = JSON.parse(data);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
var x = <%=all%>;
|
var x = <%=all%>;
|
||||||
for (var d = 0; d < json.length; d++) {
|
for (var d = 0; d < json.length; d++) {
|
||||||
|
|
||||||
|
@ -147,7 +200,11 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
|
||||||
cell2.innerHTML = json[d].timestamp;
|
cell2.innerHTML = json[d].timestamp;
|
||||||
cell1.innerHTML = json[d].content;
|
cell1.innerHTML = json[d].content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -283,3 +340,4 @@ if (document.querySelectorAll('input[name="smsn"]:checked').length === document.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%+footer%>
|
<%+footer%>
|
||||||
|
|
||||||
|
|
|
@ -292,3 +292,20 @@ msgstr "Nie"
|
||||||
msgid "Yes"
|
msgid "Yes"
|
||||||
msgstr "Tak"
|
msgstr "Tak"
|
||||||
|
|
||||||
|
msgid "Merge algorithm"
|
||||||
|
msgstr "Algorytm scalania"
|
||||||
|
|
||||||
|
msgid "Simple (merge without sorting)"
|
||||||
|
msgstr "Prosty (scala bez sortowania)"
|
||||||
|
|
||||||
|
msgid "Advanced (merges with sorting)"
|
||||||
|
msgstr "Zaawansowany (scala z sortowaniem)"
|
||||||
|
|
||||||
|
msgid "Direction of message merging"
|
||||||
|
msgstr "Kierunek łączenia wiadomości"
|
||||||
|
|
||||||
|
msgid "From beginning to end"
|
||||||
|
msgstr "Od początku do końca"
|
||||||
|
|
||||||
|
msgid "From end to beginning"
|
||||||
|
msgstr "Od końca do początku"
|
||||||
|
|
|
@ -13,3 +13,4 @@ config sms_tool 'general'
|
||||||
option storage 'SM'
|
option storage 'SM'
|
||||||
option prestart '6'
|
option prestart '6'
|
||||||
option ledtype 'D'
|
option ledtype 'D'
|
||||||
|
option algorithm 'Simple'
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#!/bin/sh /etc/rc.common
|
#!/bin/sh /etc/rc.common
|
||||||
# Copyright 2020 Rafał Wabik (IceG) - From eko.one.pl forum
|
# Copyright 2020-2023 Rafał Wabik (IceG) - From eko.one.pl forum
|
||||||
# Licensed to the GNU General Public License v3.0.
|
# Licensed to the GNU General Public License v3.0.
|
||||||
|
|
||||||
USE_PROCD=1
|
USE_PROCD=1
|
||||||
START=99
|
START=95
|
||||||
STOP=01
|
STOP=01
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
|
@ -12,11 +12,17 @@ start_service() {
|
||||||
procd_close_instance
|
procd_close_instance
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
service_triggers()
|
||||||
|
{
|
||||||
|
procd_add_reload_trigger "sms_tool"
|
||||||
|
}
|
||||||
|
|
||||||
stop_service() {
|
stop_service() {
|
||||||
for KILLPID in `ps | grep 'smsled' | awk ' { print $1;}'`; do
|
for KILLPID in `ps | grep 'smsled' | awk ' { print $1;}'`; do
|
||||||
(kill -9 $KILLPID >/dev/null 2>&1 )&
|
( kill -9 $KILLPID >/dev/null 2>&1 ) 2>&1 &
|
||||||
done
|
done
|
||||||
sleep 1
|
sleep 1 2>&1 &
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright 2020-2021 Rafał Wabik (IceG) - From eko.one.pl forum
|
# Copyright 2020-2023 Rafał Wabik (IceG) - From eko.one.pl forum
|
||||||
# Licensed to the GNU General Public License v3.0.
|
# Licensed to the GNU General Public License v3.0.
|
||||||
|
|
||||||
chmod +x /sbin/cronsync.sh
|
chmod +x /etc/init.d/smsled 2>&1 &
|
||||||
chmod +x /sbin/set_sms_ports.sh
|
chmod +x /sbin/smsled-init.sh 2>&1 &
|
||||||
chmod +x /sbin/smsled-init.sh
|
chmod +x /sbin/cronsync.sh 2>&1 &
|
||||||
chmod +x /sbin/smsled.sh
|
chmod +x /sbin/set_sms_ports.sh 2>&1 &
|
||||||
rm -rf /tmp/luci-indexcache
|
chmod +x /sbin/smsled.sh 2>&1 &
|
||||||
rm -rf /tmp/luci-modulecache/
|
rm -rf /tmp/luci-indexcache 2>&1 &
|
||||||
|
rm -rf /tmp/luci-modulecache/ 2>&1 &
|
||||||
|
|
||||||
work=false
|
work=false
|
||||||
for port in /dev/ttyUSB*
|
for port in /dev/ttyUSB*
|
||||||
|
@ -23,51 +24,51 @@ done
|
||||||
rm -rf /tmp/testusb
|
rm -rf /tmp/testusb
|
||||||
|
|
||||||
if [ $work != false ]; then
|
if [ $work != false ]; then
|
||||||
uci set sms_tool.@sms_tool[0].readport=$work
|
uci set sms_tool.@sms_tool[0].readport=$work 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].sendport=$work
|
uci set sms_tool.@sms_tool[0].sendport=$work 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].ussdport=$work
|
uci set sms_tool.@sms_tool[0].ussdport=$work 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].atport=$work
|
uci set sms_tool.@sms_tool[0].atport=$work 2>&1 &
|
||||||
uci commit sms_tool
|
uci commit sms_tool 2>&1 &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DEVICE=$(cat /tmp/sysinfo/board_name)
|
DEVICE=$(cat /tmp/sysinfo/board_name)
|
||||||
|
|
||||||
if [[ "$DEVICE" == *"mf289f"* ]]; then
|
if [[ "$DEVICE" == *"mf289f"* ]]; then
|
||||||
|
|
||||||
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci commit sms_tool
|
uci commit sms_tool 2>&1 &
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DEVICE" == *"mf286r"* ]]; then
|
if [[ "$DEVICE" == *"mf286r"* ]]; then
|
||||||
|
|
||||||
uci set sms_tool.@sms_tool[0].readport="/dev/ttyACM0"
|
uci set sms_tool.@sms_tool[0].readport="/dev/ttyACM0" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyACM0"
|
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyACM0" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyACM0"
|
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyACM0" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].atport="/dev/ttyACM0"
|
uci set sms_tool.@sms_tool[0].atport="/dev/ttyACM0" 2>&1 &
|
||||||
uci commit sms_tool
|
uci commit sms_tool 2>&1 &
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DEVICE" == *"mf286d"* ]]; then
|
if [[ "$DEVICE" == *"mf286d"* ]]; then
|
||||||
|
|
||||||
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci commit sms_tool
|
uci commit sms_tool 2>&1 &
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DEVICE" == *"mf286"* ]]; then
|
if [[ "$DEVICE" == *"mf286"* ]]; then
|
||||||
|
|
||||||
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].readport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].sendport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].ussdport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1"
|
uci set sms_tool.@sms_tool[0].atport="/dev/ttyUSB1" 2>&1 &
|
||||||
uci commit sms_tool
|
uci commit sms_tool 2>&1 &
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright 2020 Rafał Wabik (IceG) - From eko.one.pl forum
|
# Copyright 2020-2023 Rafał Wabik (IceG) - From eko.one.pl forum
|
||||||
# Licensed to the GNU General Public License v3.0.
|
# Licensed to the GNU General Public License v3.0.
|
||||||
|
|
||||||
/etc/init.d/smsled disable
|
/etc/init.d/smsled stop 2>&1 &
|
||||||
|
/etc/init.d/smsled disable 2>&1 &
|
||||||
|
/etc/init.d/smsled disable 2>&1 &
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* luci-theme-argonne
|
* luci-theme-argonne
|
||||||
*
|
*
|
||||||
* Have a bug? Please create an issue here on GitHub!
|
* Have a bug? Please create an issue here on GitHub!
|
||||||
* https://github.com/kenzok78/luci-theme-argonnene/issues
|
* https://github.com/kenzok78/luci-theme-argonne/issues
|
||||||
*
|
*
|
||||||
* luci-theme-bootstrap:
|
* luci-theme-bootstrap:
|
||||||
* Copyright 2008 Steven Barth <steven@midlink.org>
|
* Copyright 2008 Steven Barth <steven@midlink.org>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
luci-theme-argonne
|
luci-theme-argonne
|
||||||
|
|
||||||
Have a bug? Please create an issue here on GitHub!
|
Have a bug? Please create an issue here on GitHub!
|
||||||
https://github.com/jerrykuku/luci-theme-argonne/issues
|
https://github.com/kenzok78/luci-theme-argonne/issues
|
||||||
|
|
||||||
luci-theme-bootstrap:
|
luci-theme-bootstrap:
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
luci-theme-argonne
|
luci-theme-argonne
|
||||||
|
|
||||||
Have a bug? Please create an issue here on GitHub!
|
Have a bug? Please create an issue here on GitHub!
|
||||||
https://github.com/jerrykuku/luci-theme-argonne/issues
|
https://github.com/kenzok78/luci-theme-argonne/issues
|
||||||
|
|
||||||
luci-theme-bootstrap:
|
luci-theme-bootstrap:
|
||||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||||
|
|
Loading…
Reference in New Issue