summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY.h10
-rw-r--r--httpd.c2
-rw-r--r--webdo.c4
3 files changed, 10 insertions, 6 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 41c1261..9e9cbde 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
* -----------------------------------
*/
-#define _VERSION "1.1.132"
-#define VERSION_DATE "10.02.2018"
+#define _VERSION "1.1.133"
+#define VERSION_DATE "14.02.2018"
#define DB_API 6
#ifdef GIT_REV
@@ -17,8 +17,12 @@
/*
* ------------------------------------
*
+
+2018-02-14: version 1.1.133 (horchi)
+ - bugfix: Fixed display of external timer in WEBIF lists
+
2018-02-10: version 1.1.132 (rechner)
- - chanhed: text for swichtimer and highlight recIcon on success
+ - change: text for swichtimer and highlight recIcon on success
2018-02-10: version 1.1.131 (horchi)
- added: Support delete for switch timer
diff --git a/httpd.c b/httpd.c
index a4e3295..fc88279 100644
--- a/httpd.c
+++ b/httpd.c
@@ -881,7 +881,7 @@ int cEpgHttpd::initDb()
// from timers t left outer join events e
// on (t.eventid = e.masterid and e.updflg in (...))
// where
- // t.state in (?)
+ // e.updflg in in (<visible>)
// timerIncState.setField(&timerStateDef);
// timerExcState.setField(&timerStateDef);
diff --git a/webdo.c b/webdo.c
index 679501e..8374f34 100644
--- a/webdo.c
+++ b/webdo.c
@@ -1547,13 +1547,13 @@ int cEpgHttpd::doTimers(MHD_Connection* tcp, json_t* obj)
// state / action
- if (!isEmpty(action) && !strchr(action, *timerDb->getStrValue("ACTION")))
+ if (!isEmpty(action) && !strchr(action, toupper(*timerDb->getStrValue("ACTION"))))
continue;
if (!isEmpty(state)&& !strchr(state, *timerDb->getStrValue("STATE")))
continue;
- if (!isEmpty(naction) && strchr(naction, *timerDb->getStrValue("ACTION")))
+ if (!isEmpty(naction) && strchr(naction, toupper(*timerDb->getStrValue("ACTION"))))
continue;
if (!isEmpty(nstate) && strchr(nstate, *timerDb->getStrValue("STATE")))