Commit graph

206 commits

Author SHA1 Message Date
Bastian Schroll aa20cd0cfb
Merge pull request #354 from CJHarms/ffagent-plugin-fixes
FF Agent Plugin Fixes
(Typo and Debugging)
2018-02-22 08:36:55 +01:00
CJHarms 3ed90b4a97 Revert "Convert alarmHeaders to OrderedDict"
This reverts commit 9257cb2cfe.
2018-02-19 17:37:02 +01:00
CJHarms 9257cb2cfe Convert alarmHeaders to OrderedDict
Used OrderedDict for the alarmHeaders to make sure the Dictionary Order is preserved to serve a correctly formated and ordered JSON when using Perl <3.6
2018-02-16 22:07:45 +01:00
CJHarms 14df7d7fa4 Fixed small Typo
Fixed a small Typo
2018-02-13 18:31:40 +01:00
CJHarms fcae71a7d1 Added some more Logging
Added more Debug Logging for the alarmHeaders
2018-02-13 18:31:04 +01:00
Bastian Schroll cf1b5b3fc4 PEP8 changes to pushover 2018-01-15 06:56:12 +01:00
Florian 098fcc2c46
Increasing functions for FMS and ZVEI
- reading new sections from config
- enabling wildcard-handling
- sending POCSAG, ZVEI and FMS
2018-01-14 23:35:31 +01:00
Bastian Schroll 7c6611a072 fix mysql plugin 2018-01-03 12:10:20 +01:00
Jan-Hendrik Plogmann 46f7719c89 fixed syntax 2017-12-23 12:37:13 +01:00
Jan-Hendrik Plogmann b565a31637 added mysql Port to mysql connect and config 2017-12-23 12:35:02 +01:00
Bastian Schroll 02d7ba2055
Merge branch 'develop' into fix_http_req 2017-12-19 11:40:01 +01:00
Bastian Schroll 4646012723 comment for FE in source 2017-12-19 11:28:04 +01:00
Bastian Schroll 0539e33207 fix copy fail
only made a ref not a real copy
2017-12-19 09:05:27 +01:00
Bastian Schroll 84932346b5 fix http request plugin bug
data field overwrite bug
2017-12-19 08:35:10 +01:00
Bastian Schroll 5b9c8d75d9 fix indentation level 2017-10-03 19:20:38 +02:00
Bastian Schroll de6073e8f6 fix indentation level 2017-10-03 18:42:38 +02:00
Bastian Schroll cea266709c fix indentation level 2017-10-03 18:39:18 +02:00
Bastian Schroll a74ef0fe45 fix indentation level 2017-10-03 18:37:09 +02:00
Bastian Schroll cb0fd53713 insert history flag for netIdent 2017-10-03 18:26:16 +02:00
Bastian Schroll acbef6591c edits for codacy (#310) 2017-10-02 07:25:22 +02:00
PeterLaemmle d4946bf714 Update Telegram.py
Import libraries urllib and googlemaps only if RICforLocationAPIKey is defined.
2017-09-30 18:11:20 +02:00
Bastian Schroll 84d39d0686 revert last merge
see #296
2017-09-15 06:33:52 +02:00
Bastian Schroll 42e7de7d4c Merge pull request #286 from PeterLaemmle/develop
Improve code style
2017-08-06 15:18:44 +02:00
Jockel 311b183265 added support for custom texts with telegram 2017-07-31 07:34:14 +02:00
PeterLaemmle a4c9d8197f Update notifyMyAndroid.py
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217)
-Using global for 'fmsAPIKeyList' but no assignment is done
-Using global for 'zveiAPIKeyList' but no assignment is done
-Using global for 'pocAPIKeyList' but no assignment is done
2017-05-24 19:30:41 +02:00
Bastian Schroll 3ce29711a1 Merge pull request #277 from PeterLaemmle/develop
Update of Telegram plugin
2017-05-24 06:14:37 +02:00
Florian f2e7c00fee Fix for leading zeros in RIC
Prevent from cutting leading zeros in signal-RIC
2017-05-14 22:53:42 +02:00
PeterLaemmle d7896459ca Update Telegram.py 2017-05-07 19:23:45 +02:00
PeterLaemmle 78092389e9 Update Telegram.py
Removal of duplicate code.
2017-05-07 13:38:30 +02:00
Jockel 80a9cdb6f4 removed lineBrakeAllowed 2017-04-25 10:52:03 +02:00
Jockel d3cbbb60d8 added missing lineBrakeAllowed=True 2017-04-25 06:53:15 +02:00
Jan-Hendrik Plogmann d99574239b fixed syntax issues 2017-04-24 20:17:07 +02:00
Jan-Hendrik Plogmann 4e1cf00cb3 read message-text from config 2017-04-24 20:08:37 +02:00
Florian 2e03519333 Fixing message
Set default-message to alarm
Fixing ZVEI-message; it now contains zvei, and, if available, description
2017-04-17 10:46:39 +02:00
Florian 142e2ba5b0 Fixing typo
Removed double-c from conn-string
2017-04-17 10:00:20 +02:00
Florian 08c671cd09 Update Sms77.py
Adapting to new API
2017-04-16 23:48:46 +02:00
Florian 642d95b11a Enabling typ-handling
Enable FMS and ZVEI-handling for plugin; message is set depending on the available information and processed to the http-handling. If typ is invalid an empty message will be sent.
The text of the message can be adapted with regard to the information resulting from decoding
2017-04-16 23:47:08 +02:00
Mikrocontroller c77f2a9fdd Encode data URL-safe, support of multiple URLs 2017-04-12 23:20:40 +02:00
Florian 7d7c33e208 Create boswatch_cleanup.sql
Extracted routines to cleanup old database-entries.
2017-04-04 22:17:54 +02:00
Florian 7abda0bc50 Delete events
Delete events from default-installation and extract them to a separate file
2017-04-04 22:16:28 +02:00
Jockel 07c3a98981 base build 2017-02-20 10:25:56 +01:00
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master
Update Telegram.py
2017-02-14 20:57:23 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
PeterLaemmle df24ee4e9e Update Telegram.py
Added FMS and ZVEI support
2017-02-01 20:41:35 +01:00
Florian 8724cc64fe Update eMail.py
Adapting to master-branch (#200)
2017-01-25 22:03:04 +01:00
Florian 20e9f567a0 Update eMail.py
Fixing if-condition for TLS
2017-01-16 21:22:22 +01:00
Florian 8cdfef4bce Update eMail.py
Using only SMTP via SSL can lead to errors depending on the configuration of the mail server
As there is no switch in the config file (which is good so) the approach is to use SSL first and, if this fails, switch to non-SSL connection.

Due to the importance of this plugin the pull request is affecting the master-branch.
2017-01-16 21:20:14 +01:00
Florian 7ad21a7a6d Update eMail.py
Fixing wrong variable - globals to globalVars
2017-01-16 13:08:17 +01:00
Florian 7390a539d3 MySQL.py
Adapting to global net-identifiers
2016-12-22 22:37:06 +01:00
Bastian Schroll 14d1dedcec fix comment bug 2016-11-20 13:37:29 +01:00