From a872fb2d6a53107269c0c7e39e87d84216b5acca Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 3 Feb 2019 06:36:15 +0000 Subject: [PATCH] 49_SSCam: contrib 8.8.0 git-svn-id: https://svn.fhem.de/fhem/trunk@18486 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/49_SSCam.pm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index c46190153..4443fc6b9 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -47,7 +47,7 @@ use Encode; # Versions History intern our %SSCam_vNotesIntern = ( - "8.8.0" => "01.02.2019 send snapshots by telegram ", + "8.8.0" => "03.02.2019 send snapshots by telegram ", "8.7.2" => "30.01.2019 code change for snapCams (SVS) ", "8.7.1" => "30.01.2019 fix refresh snapgallery device if snap was done by itself ", "8.7.0" => "27.01.2019 send recording by email ", @@ -838,7 +838,7 @@ sub SSCam_Set($@) { if ($emtxt) { # Snap soll nach Erstellung per Email versendet werden # Format $emtxt muss sein: snapEmailTxt:"subject => , body => " - if (!$hash->{SMTPCREDENTIALS}) {return "Due to attribute \"snapEmailTxt\" is set, you want to send snapshots by email but SMTP credentials are not set - make sure you've set credentials with \"set $name smtpcredentials username password\"";} + if (!$hash->{SMTPCREDENTIALS}) {return "It seems you want to send snapshots by email but SMTP credentials are not set - make sure you've set credentials with \"set $name smtpcredentials username password\"";} $hash->{HELPER}{SMTPMSG} = $emtxt; } @@ -8677,7 +8677,7 @@ return ($str);

- + HTTP-Timeout Settings

@@ -9225,7 +9225,7 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay>

    -
  • set <name> snap [<number>] [<time difference>] [snapEmailTxt:"subject => <subject text>, body => <message text>"]     (valid for CAM)

    • +
  • set <name> snap [<number>] [<time difference>] [snapEmailTxt:"subject => <subject text>, body => <message text>"] [snapTelegramTxt:"tbot => <TelegramBot device>, peers => [<peer1 peer2 ...>], subject => [<subject text>]"]     (valid for CAM)

    • One or multiple snapshots are triggered. The number of snapshots to trigger and the time difference (in seconds) between each snapshot can be optionally specified. Without any specification only one snapshot is triggered.
    @@ -9239,12 +9239,21 @@ attr <name> genericStrmHtmlTag <video $HTMLATTR controls autoplay> Before you have to prepare the Email shipping as described in section Setup Email shipping. (for further information execute "get <name> versionNotes 7")
    If you want temporary overwrite the message text set in attribute "snapEmailTxt", you can optionally specify the - "snapEmailTxt:"-tag as shown above.

    + "snapEmailTxt:"-tag as shown above. If the attribute "snapEmailTxt" is not set, the Email shipping is + activated one-time. (the tag-syntax is equivalent to the "snapEmailTxt" attribut)

    + + A snapshot shipping by Telegram can be permanntly activated by setting attribute + "snapTelegramTxt". Before you have to prepare the Email shipping as mentioned before.
    + If you want temporary overwrite the message text set in attribute "snapTelegramTxt", you can optionally specify the + "snapTelegramTxt:"-tag as shown above. If the attribute "snapTelegramTxt" is not set, the shipping by Telegram is + activated one-time. (the tag-syntax is equivalent to the "snapTelegramTxt" attribut)

    Examples: 
    +    set <name> snap
     set <name> snap 4 
     set <name> snap 3 3 snapEmailTxt:"subject => Movement alarm $CAM, body => A movement was recognised at Carport"
+    set <name> snap 2 snapTelegramTxt:"tbot => teleBot, peers => , subject => Movement alarm by $CAM. The snapshot $FILE was created at $CTIME"


@@ -9568,7 +9577,8 @@ http(s)://<hostname><port>/webapi/entry.cgi?api=SYNO.SurveillanceSta $CTIME - creation time of the snapshot -
+
+

@@ -11298,7 +11308,8 @@ http(s)://<hostname><port>/webapi/entry.cgi?api=SYNO.SurveillanceSta $CTIME - Erstellungszeit des Schnappschusses -
+
+