no message

Nall-chan · Jan 30, 2024 · 647f1c7 · 647f1c7
1 parent 8f45e39
commit 647f1c7
Show file tree

Hide file tree

Showing 7 changed files with 3,059 additions and 43 deletions.
diff --git a/ONVIF IO/module.php b/ONVIF IO/module.php
@@ -600,11 +600,11 @@ protected function StartConnection()
                 //Fallback für reine Profile S Geräte
                 $VideoSources = $this->GetVideoSources($XAddr[\ONVIF\NS::Media], \ONVIF\WSDL::Media); // array of Token
                 if ($VideoSources) {
-                    $NbrOfVideoSources = count($VideoSources['VideoSources']);
+                    $NbrOfVideoSources = count($VideoSources);
                 }
                 $AudioSources = $this->GetAudioSources($XAddr[\ONVIF\NS::Media], \ONVIF\WSDL::Media); // array of Token
                 if ($AudioSources) {
-                    $NbrOfAudioSources = count($AudioSources['AudioSources']);
+                    $NbrOfAudioSources = count($AudioSources);
                 }
                 $DigitalInputs = $this->GetDigitalInputs($XAddr[\ONVIF\NS::Management], \ONVIF\WSDL::Management);
                 if (!$DigitalInputs) {
@@ -1669,11 +1669,11 @@ protected function GetVideoSources($Uri, $WSDL)
         if (is_a($VideoSources, 'SoapFault')) {
             return false;
         }
-        if (!is_array($VideoSources)) {
+        if (!is_array($VideoSources->VideoSources)) {
             $Result = [];
-            $Result[] = json_decode(json_encode($VideoSources), true);
+            $Result[] = json_decode(json_encode($VideoSources->VideoSources), true);
         } else {
-            $Result = json_decode(json_encode($VideoSources), true);
+            $Result = json_decode(json_encode($VideoSources->VideoSources), true);
         }
         return $Result;
     }
@@ -1683,11 +1683,11 @@ protected function GetAudioSources($Uri, $WSDL)
         if (is_a($AudioSources, 'SoapFault')) {
             return false;
         }
-        if (!is_array($AudioSources)) {
+        if (!is_array($AudioSources->AudioSources)) {
             $Result = [];
-            $Result[] = json_decode(json_encode($AudioSources), true);
+            $Result[] = json_decode(json_encode($AudioSources->AudioSources), true);
         } else {
-            $Result = json_decode(json_encode($AudioSources), true);
+            $Result = json_decode(json_encode($AudioSources->AudioSources), true);
         }
         return $Result;
     }
@@ -1775,12 +1775,14 @@ protected function GetServices(): bool
 
         $xml = new DOMDocument();
         $xml->loadXML($Response);
-        $this->SendDebug('TEST', $Response, 0);
         $xPath = new DOMXPath($xml);
 
         foreach ($ServicesResult as $Service) {
             $XAddr[$Service['Namespace']] = parse_url($Service['XAddr'], PHP_URL_PATH);
             $NSKey = array_search($Service['Namespace'], \ONVIF\NS::Namespaces);
+            if (!$NSKey) {
+                continue;
+            }
             $xPath->registerNamespace($NSKey, $Service['Namespace']);
 
             switch ($Service['Namespace']) {

diff --git a/library.json b/library.json
@@ -6,7 +6,7 @@
     "compatibility": {
         "version": "6.1"
     },
-    "version": "2.16",
-    "build": 216,
-    "date": 1706551768
+    "version": "2.17",
+    "build": 217,
+    "date": 1706078839
 }