andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

password in web is mandatory

Browse Source
This commit is contained in:
Paul
2019-09-16 21:55:05 +02:00
parent 6ddad2e1ed
commit 4e5cc83651
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/websrc/myesp.js
View File

@@ -544,12 +544,17 @@ function twoDigits(value) {
function initEventTable() { function initEventTable() {
var newlist = []; var newlist = [];
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var dup = JSON.parse(data[i]);
dup.uid = i;
newlist[i] = {}; newlist[i] = {};
newlist[i].options = {}; newlist[i].options = {};
newlist[i].value = {}; newlist[i].value = {};
try {
var dup = JSON.parse(data[i]);
dup.uid = i + 1;
} catch (e) {
var dup = { "uid": i, "type": "ERRO", "src": "SYS", "desc": "Error in logfile entry", "data": data[i], "time": 1 }
}
newlist[i].value = dup; newlist[i].value = dup;
var c = dup.type; var c = dup.type;
switch (c) { switch (c) {
case "WARN": case "WARN":
@@ -564,7 +569,6 @@ function initEventTable() {
default: default:
break; break;
} }
} }
jQuery(function ($) { jQuery(function ($) {
window.FooTable.init("#eventtable", { window.FooTable.init("#eventtable", {

17
tools/wsemulator/wserver.js
View File

@@ -51,18 +51,11 @@ var eventlog = {
"command": "eventlist", "command": "eventlist",
"page": 1, "page": 1,
"haspages": 1, "haspages": 1,
"list": [ "list":[
"{ \"type\": \"WARN\", \"src\": \"sys\", \"desc\": \"Event log cleared!\", \"data\": \"\", \"time\": 1563371160 }", "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #1\",\"time\": 1563371160}",
"{ \"type\": \"WARN\", \"src\": \"sys\", \"desc\": \"Event log cleared!\", \"data\": \"\", \"time\": 1563371160 }", "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #2\",\"time\":0}",
"{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }", "{\"type\":\"INFO\",\"src\":\"system\",\"desc\":\"System booted\",\"data\":\"\",\"time\":1568660479}",
"{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }", "{\"type\":\"WARN\",\"src\":\"system\",\"desc\":\"test data\",\"data\":\"Record #3\",\"time\":0}"
"{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }",
"{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }",
"{ \"type\": \"WARN\", \"src\": \"websrv\", \"desc\": \"New login attempt\", \"data\": \"\", \"time\": 1563371160 }",
"{ \"type\": \"INFO\", \"src\": \"websrv\", \"desc\": \"Login success!\", \"data\": \"\", \"time\": 1563371160 }",
"{ \"type\": \"INFO\", \"src\": \"wifi\", \"desc\": \"WiFi is connected\", \"data\": \"SMC\", \"time\": 13 }",
"{ \"type\": \"INFO\", \"src\": \"sys\", \"desc\": \"System setup completed, running\", \"data\": \"\", \"time\": 13 }",
"{ \"type\": \"WARN\", \"src\": \"websrv\", \"desc\": \"New login attempt\", \"data\": \"\", \"time\": 1563371160 }"
] ]
} }