Merge pull request #305 from Schrolli91/beta

new release

CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+
+#### __[v2.2.1]__ - 19.09.2017
+##### Added
+- Neues Service Script
+- Eigene Message fpr jeden Typ im Telegram Plugin
+
+##### Changed
+- Name der csv Dateien um überschreiben bei Update zu vermeiden
+- Description Liste kann nun zusätzlich Einträge für jede Subric enthalten
+- RegEX verbietet nun grundsätzlich alles - Es muss explizit zugelassen werden
+
+##### Deprecated
+##### Removed
+##### Fixed
+- Bug im SMS77 Plugin
+
+##### Security
+
+
+----------------------------
+
+
+Zum schreiben des Changelog's siehe:
+http://keepachangelog.com/de/1.0.0/

README.md

@@ -46,7 +46,7 @@ unless you are developer you can use the develop-Branch - may be unstable!
 - other Ideas per Issues please
 
 
-###Plugins
+### Plugins
 If you want to code your own Plugin, see `plugins/README.md`.
 
 ##### Implemented plugins:
@@ -81,7 +81,7 @@ For the other functions see "Usage" below.
 For the RegEX filter functions see Section `[Filters]`
 http://www.regexr.com/ - RegEX test tool an documentation
 
-No filter for a combination typ/plugin = all data will pass
+If RegEX is enabled - only alloewd data will pass !
 
 Syntax: `INDIVIDUAL_NAME = TYP;DATAFIELD;PLUGIN;FREQUENZ;REGEX` (separator `;`)
 - `TYP` = the data typ (FMS|ZVEI|POC)

config/config.template.ini

@@ -49,7 +49,7 @@ doubleFilter_ignore_time = 5
 doubleFilter_check_msg = 0
 
 # writes the multimon-ng raw data stream into a text file named mm_raw.txt
-writeMultimonRaw = 1
+writeMultimonRaw = 0
 
 [NMAHandler]
 # you can use a logging handler for sending logging records to NotifyMyAndroid
@@ -169,6 +169,8 @@ tableSIG = bos_signal
 [httpRequest]
 # example URL http://example.com/remote.php?DESCR=%DESCR%
 
+# multiple URLs can be separated by comma
+
 # you can use the following wildcards in your URL as GET params:
 # http://en.wikipedia.org/wiki/Query_string
 
@@ -413,13 +415,46 @@ RICforLocationAPIKey =
 # Required if you want to create a map based on location information received with the above RIC.
 GoogleAPIKey =
 
+# %FMS%     = FMS Code
+# %STATUS%  = FMS Status
+# %DIR%     = Direction of the telegram (0/1)
+# %DIRT%    = Direction of the telegram (Text-String)
+# %TSI%     = Tactical Short Information (I-IV)
+# %DESCR%   = Description, if description-module is used
+# %DATE%    = Date (by script)
+# %TIME%    = Time (by script)
+# %LPAR%    = (
+# %RPAR%    = )
+FMS_message = %DATE% %TIME%: %FMS%
+
+# %ZVEI%    = ZVEI 5-tone Code
+# %DESCR%   = Description, if description-module is used
+# %DATE%    = Date (by script)
+# %TIME%    = Time (by script)
+# %LPAR%    = (
+# %RPAR%    = )
+ZVEI_message = %DATE% %TIME%: %ZVEI%
+
+# %RIC%      = POCSAG RIC
+# %FUNC%     = POCSAG function/Subric (1-4)
+# %FUNCCHAR% = POCSAG function/Subric als character (a-d)
+# %MSG%      = Message of the POCSAG telegram
+# %BITRATE%  = Bitrate of the POCSAG telegram
+# %DESCR%    = Description, if description-module is used
+# %DATE%     = Date (by script)
+# %TIME%     = Time (by script)
+# %LPAR%     = (
+# %RPAR%     = )
+POC_message = %MSG%
+
+
 [yowsup]
 # number or chat-number who whants to become the news
-empfaenger = 
+empfaenger =
 # WhatsApp-number of that the news comes
-sender = 
+sender =
 # password from this number
-password= 
+password=
 
 # %FMS%     = FMS Code
 # %STATUS%  = FMS Status

exampleAddOns/alarmMonitorWeb/MySQL-Import/login.sql

@@ -36,7 +36,7 @@ CREATE TABLE `login` (
 
 LOCK TABLES `login` WRITE;
 /*!40000 ALTER TABLE `login` DISABLE KEYS */;
-INSERT INTO `login` VALUES ,(1,'Test','098f6bcd4621d373cade4e832627b4f6');
+INSERT INTO `login` VALUES (1,'admin',md5('admin'));
 /*!40000 ALTER TABLE `login` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

exampleAddOns/alarmMonitorWeb/config.php

@@ -1,8 +1,8 @@
 <?php
 
 $dbhost = "localhost";
-$dbuser = "USERNAME";
-$dbpassword = "PASSWORD";
+$dbuser = "boswatch";
+$dbpassword = "boswatch";
 $database = "boswatch";
 
 $tableFMS = "bos_fms";

exampleAddOns/alarmMonitorWeb/do_eintragen.php

@@ -0,0 +1,57 @@
+
+<?php 
+session_start(); 
+?> 
+
+<?php 
+if(($_SESSION["username"])!="admin") 
+   { 
+   echo "Sie sind nicht berechtigt fuer diesen Bereich"; 
+   exit; 
+   } 
+?> 
+
+
+
+
+<?php 
+@require_once("config.php");
+$verbindung = mysqli_connect($dbhost, $dbuser , $dbpassword, $database) 
+or die("Verbindung zur Datenbank konnte nicht hergestellt werden"); 
+
+$username = $_POST["username"]; 
+$passwort = $_POST["passwort"]; 
+$passwort2 = $_POST["passwort2"]; 
+
+if($passwort != $passwort2 OR $username == "" OR $passwort == "") 
+    { 
+    echo "Eingabefehler. Bitte alle Felder korekt ausfüllen. <a href=\"eintragen.html\">Zurück</a>"; 
+    exit; 
+    } 
+$passwort = md5($passwort); 
+
+$result = mysqli_query($verbindung, "SELECT id FROM login WHERE username LIKE '$username'"); 
+$menge = mysqli_num_rows($result); 
+
+if($menge == 0) 
+    { 
+    $eintrag = "INSERT INTO login (username, passwort) VALUES ('$username', '$passwort')"; 
+    $eintragen = mysqli_query($verbindung, $eintrag); 
+
+    if($eintragen == true) 
+        { 
+        echo "Benutzername <b>$username</b> wurde erstellt. <a href=\"index.php\">Login</a>"; 
+        } 
+    else 
+        { 
+        echo "Fehler beim Speichern des Benutzernames. <a href=\"eintragen.html\">Zurück</a>"; 
+        } 
+
+
+    } 
+
+else 
+    { 
+    echo "Benutzername schon vorhanden. <a href=\"eintragen.html\">Zurück</a>"; 
+    } 
+?>