2.13

Nall-chan · Dec 8, 2023 · 779c3bf · 779c3bf
1 parent 4aebb29
commit 779c3bf
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 51 deletions.
diff --git a/ONVIF Configurator/README.md b/ONVIF Configurator/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Digital Input/README.md b/ONVIF Digital Input/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)
@@ -57,8 +57,8 @@ Der Ereignis-Pfad wird bei Digital-Input versucht automatisch zu erkennen, alter
 
 Die Statusvariablen werden automatisch angelegt. Das Löschen einzelner kann zu Fehlfunktionen führen.
 
-| Name                           | Typ  | Beschreibung                                                                                |
-| ------------------------------ | ---- | ------------------------------------------------------------------------------------------- |
+| Name                            | Typ  | Beschreibung                                                              |
+| ------------------------------- | ---- | ------------------------------------------------------------------------- |
 | je nach Name des Onvif-Ereignis | bool | Für jeden Digital-Eingang wird eine passende Variable in Symcon erstellt. |
 
 

diff --git a/ONVIF Digital Input/module.php b/ONVIF Digital Input/module.php
@@ -55,10 +55,10 @@ public function ReceiveData($JSONString)
         $this->SendDebug('ReceiveEvent', $Data, 0);
         $EventProperties = $this->ReadAttributeArray(\ONVIF\Device\Attribute::EventProperties);
         if (!array_key_exists($Data['Topic'], $EventProperties)) {
-            return false;
+            return '';
         }
         if ((count($Data['Sources']) != 1) || (count($Data['DataValues']) != 1)) {
-            return false;
+            return '';
         }
 
         $Name = $Data['Sources'][0]['Value'];
@@ -76,7 +76,7 @@ public function ReceiveData($JSONString)
 
         $this->RegisterVariableBoolean($Ident, $Name, '', 0);
         $this->SetValueBoolean($Ident, $VariableValue);
-        return true;
+        return '';
     }
 
     public function GetConfigurationForm()

diff --git a/ONVIF Digital Output/README.md b/ONVIF Digital Output/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Digital Output/module.php b/ONVIF Digital Output/module.php
@@ -102,26 +102,27 @@ public function ReceiveData($JSONString)
         $EventProperty = array_pop($Events);
         $SourceIndex = array_search('tt:ReferenceToken', array_column($EventProperty['Sources'], 'Type'));
         if ($SourceIndex === false) {
-            return;
+            return '';
         }
         $SourceName = $EventProperty['Sources'][$SourceIndex]['Name'];
         $EventSourceIndex = array_search($SourceName, array_column($Data['Sources'], 'Name'));
         if ($EventSourceIndex === false) {
-            return;
+            return '';
         }
         $Ident = $Data['Sources'][$EventSourceIndex]['Value'];
         $DataIndex = array_search('tt:RelayLogicalState', array_column($EventProperty['Data'], 'Type'));
         if ($DataIndex === false) {
-            return;
+            return '';
         }
         $DataName = $EventProperty['Data'][$SourceIndex]['Name'];
         $EventDataIndex = array_search($DataName, array_column($Data['DataValues'], 'Name'));
         if ($EventDataIndex === false) {
-            return;
+            return '';
         }
         $Value = $Data['DataValues'][$EventDataIndex]['Value'];
         $this->RegisterVariableBoolean($Ident, $Ident, '~Switch', 0);
         $this->SetValueBoolean($Ident, ($Value == 'active'));
+        return '';
     }
 
     public function GetConfigurationForm()

diff --git a/ONVIF Discovery/README.md b/ONVIF Discovery/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Events/README.md b/ONVIF Events/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Events/module.php b/ONVIF Events/module.php
@@ -38,10 +38,11 @@ public function ReceiveData($JSONString)
         $this->SendDebug('ReceiveEvent', $Data, 0);
         $EventProperties = $this->ReadAttributeArray(\ONVIF\Device\Attribute::EventProperties);
         if (!array_key_exists($Data['Topic'], $EventProperties)) {
-            return false;
+            return '';
         }
         $PreName = str_replace($this->ReadPropertyString(\ONVIF\Device\Property::EventTopic), '', $Data['Topic']);
-        return $this->SetEventStatusVariable($PreName, $EventProperties[$Data['Topic']], $Data);
+        $this->SetEventStatusVariable($PreName, $EventProperties[$Data['Topic']], $Data);
+        return '';
     }
 
     public function GetConfigurationForm()

diff --git a/ONVIF IO/README.md b/ONVIF IO/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Image Grabber/README.md b/ONVIF Image Grabber/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Image Grabber/module.php b/ONVIF Image Grabber/module.php
@@ -8,7 +8,7 @@
  */
 class ONVIFImageGrabber extends ONVIFModuleBase
 {
-    public const wsdl = \ONVIF\WSDL::Media; //'media-mod';
+    public const wsdl = \ONVIF\WSDL::Media;
     public const TopicFilter = 'videosource';
 
     public function Create()
@@ -94,7 +94,7 @@ public function ReceiveData($JSONString)
         $this->SendDebug('ReceiveEvent', $Data, 0);
         $EventProperties = $this->ReadAttributeArray(\ONVIF\Device\Attribute::EventProperties);
         if (!array_key_exists($Data['Topic'], $EventProperties)) {
-            return false;
+            return '';
         }
         $EventProperty = $EventProperties[$Data['Topic']];
         $FoundEventIndex = false;
@@ -122,10 +122,11 @@ public function ReceiveData($JSONString)
             unset($Data['Sources'][$FoundEventIndex]);
         }
         if ($SkipEvent) {
-            return false;
+            return '';
         }
         $PreName = str_replace($this->ReadPropertyString(\ONVIF\Device\Property::EventTopic), '', $Data['Topic']);
-        return $this->SetEventStatusVariable($PreName, $EventProperties[$Data['Topic']], $Data);
+        $this->SetEventStatusVariable($PreName, $EventProperties[$Data['Topic']], $Data);
+        return '';
     }
 
     public function GetConfigurationForm()
@@ -333,13 +334,13 @@ public function RequestAction($Ident, $Value)
         switch ($Ident) {
             case 'RefreshProfileForm':
                 $this->RefreshProfileForm($Value);
-                return true;
+                return;
             case \ONVIF\ImageGrabber\Timer::UpdateImage:
                 $this->UpdateImage();
                 if ((bool) $Value) {
                     $this->ReloadForm();
                 }
-                return true;
+                return;
         }
     }
     protected function IOChangeState($State)
@@ -354,7 +355,7 @@ protected function RefreshProfileForm($NewVideoSource)
     {
         $Capabilities = @$this->GetCapabilities();
         if ($Capabilities == false) {
-            return false;
+            return;
         }
         $ProfileOptions = [];
         $ProfileOptions[] = [

diff --git a/ONVIF Media Stream/README.md b/ONVIF Media Stream/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)

diff --git a/ONVIF Media Stream/module.php b/ONVIF Media Stream/module.php
@@ -865,12 +865,12 @@ public function RequestAction($Ident, $Value)
             return true;
         }
         if ($Ident == 'RefreshProfileForm') {
-            $this->RefreshProfileForm($Value);
-            return true;
+            $this->RefreshProfileForm((string) $Value);
+            return;
         }
         if ($Ident == 'RefreshEnablePresetProfileForm') {
-            $this->RefreshPresetProfileForm($Value);
-            return true;
+            $this->RefreshPresetProfileForm((bool) $Value);
+            return;
         }
         $Speed = 0;
         if (@$this->GetIDForIdent('SPEED')) {
@@ -882,18 +882,17 @@ public function RequestAction($Ident, $Value)
         }
         switch ($Ident) {
             case 'PRESET':
-                if ($this->GotoPreset((int) $Value)) {
-                    $this->SetValue('PRESET', $Value);
-                    return true;
+                if ($this->GotoPreset($Value)) {
+                    $this->SetValueInteger('PRESET', (int) $Value);
                 }
-                return false;
+                return;
             case 'TIME':
             case 'SPEED':
-                $this->SetValueFloat($Ident, $Value);
-                return true;
+                $this->SetValueFloat($Ident, (float) $Value);
+                return;
             case 'PT':
                 $Result = false;
-                switch ($Value) {
+                switch ((int) $Value) {
                     case 0:
                         $Result = $this->MoveLeftSpeedTime($Speed, $Time);
                         break;
@@ -913,15 +912,15 @@ public function RequestAction($Ident, $Value)
                         set_error_handler([$this, 'ModulErrorHandler']);
                         trigger_error($this->Translate('Invalid Value.'), E_USER_NOTICE);
                         restore_error_handler();
-                        return false;
+                        return;
                 }
                 if ($Result) {
                     $this->SetValueInteger('PT', $Value);
                 }
-                return $Result;
+                return;
             case 'ZOOM':
                 $Result = false;
-                switch ($Value) {
+                switch ((int) $Value) {
                     case 0:
                         $Result = $this->ZoomFarSpeedTime($Speed, $Time);
                         break;
@@ -935,17 +934,17 @@ public function RequestAction($Ident, $Value)
                         set_error_handler([$this, 'ModulErrorHandler']);
                         trigger_error($this->Translate('Invalid Value.'), E_USER_NOTICE);
                         restore_error_handler();
-                        return false;
+                        return;
                 }
                 if ($Result) {
-                    $this->SetValueInteger('ZOOM', $Value);
+                    $this->SetValueInteger('ZOOM', (int) $Value);
                 }
-                return $Result;
+                return;
         }
         set_error_handler([$this, 'ModulErrorHandler']);
         trigger_error($this->Translate('Invalid Ident.'), E_USER_NOTICE);
         restore_error_handler();
-        return false;
+        return;
     }
 
     public function ReceiveData($JSONString)
@@ -1003,7 +1002,7 @@ protected function RefreshProfileForm($NewVideoSource)
     {
         $Capabilities = @$this->GetCapabilities();
         if ($Capabilities == false) {
-            return false;
+            return;
         }
         $ProfileOptions = [];
         $ProfileOptions[] = [

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20Version-2.12-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
+[![Version](https://img.shields.io/badge/Modul%20Version-2.13-blue.svg)](https://community.symcon.de/t/modul-onvif-profil-s-fuer-ip-kameras-und-encoder/52036)
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://www.symcon.de/service/dokumentation/installation/migrationen/v60-v61-q1-2022/)  
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 [![Check Style](https://github.com/Nall-chan/ONVIF/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/ONVIF/actions)
@@ -140,7 +140,7 @@ Für das Discovery werden Pakete über die Multicast-Adresse `239.255.255.250` a
 ----------
 ### 2. Changelog
 
-**Version 2.12:** <span style="color:red">**(Dies ist die letzte Version für IPS kleiner Version 7.0)**</span>  
+**Version 2.13:** <span style="color:red">**(Dies ist die letzte Version für IPS kleiner Version 7.0)**</span>  
 - Lesen der Fähigkeiten eines Gerätes in der IO Instanz verbessert.  
 - IO Instanz schreibt Warnungen in das Meldungslog.  
 - Vorhandene Fehlermeldungen bei der Kommunikation enthalten jetzt den Funktionsnamen bei welchem er Fehler aufgetreten ist.  

diff --git a/library.json b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "6.1"
     },
-    "version": "2.12",
-    "build": 212,
-    "date": 1691306925
+    "version": "2.13",
+    "build": 213,
+    "date": 1702047058
 }
diff --git a/libs/ONVIFModuleBase.php b/libs/ONVIFModuleBase.php
@@ -317,7 +317,7 @@ protected static function unparse_url($parsed_url)
 
     protected function ModulErrorHandler($errno, $errstr)
     {
-        $this->SendDebug('ERROR', utf8_decode($errstr), 0);
+        $this->SendDebug('ERROR', $errstr, 0);
         echo $errstr . "\r\n";
         //return true;
     }