Continue

3liz · Dec 20, 2024 · 44db452 · 44db452
1 parent abd34de
commit 44db452
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 30 deletions.
diff --git a/lizmap/modules/dataviz/classes/datavizPlot.class.php b/lizmap/modules/dataviz/classes/datavizPlot.class.php
@@ -493,7 +493,7 @@ public function fetchData($method = 'wfs', $exp_filter = '')
             $features = null;
 
             // Check code
-            if (floor($wfsresponse->getCode() / 100) >= 4) {
+            if ($wfsresponse->getCode() >= 400) {
                 return false;
             }
             // Check mime/type

diff --git a/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php b/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
@@ -1127,7 +1127,7 @@ public function isFeatureEditable($feature)
         $result = $wfsRequest->process();
 
         // Check code
-        if (floor($result->getCode() / 100) >= 4) {
+        if ($result->getCode() >= 400) {
             return true;
         }
 
@@ -1143,23 +1143,6 @@ public function isFeatureEditable($feature)
         }
 
         return true;
-        /*
-                // Get data
-                $wfsData = $result->getBodyAsString();
-
-                // Check data: if there is no data returned by WFS, the user has not access to it
-                if (!$wfsData) {
-                    return true;
-                }
-
-                // Get data from layer
-                $wfsData = json_decode($wfsData);
-                if (count($wfsData->features) !== 1) {
-                    return false;
-                }
-
-                return true;
-                */
     }
 
     /**

diff --git a/lizmap/modules/lizmap/lib/Form/QgisForm.php b/lizmap/modules/lizmap/lib/Form/QgisForm.php
@@ -1777,14 +1777,14 @@ protected function PerformWfsRequest($wfsRequest, $formControl, $referencedField
         // Perform request
         $result = $wfsRequest->process();
 
-        $wfsData = $result->getBodyAsString();
+        $code = $result->getCode();
         $mime = $result->getMime();
 
         // Used data
-        if ($wfsData && !in_array(strtolower($mime), array('text/html', 'text/xml'))) {
-            $wfsData = json_decode($wfsData);
+        if ($code < 400 && !in_array(strtolower($mime), array('text/html', 'text/xml'))) {
             // Get data from layer
-            $features = $wfsData->features;
+            $featureStream = Psr7\StreamWrapper::getResource($result->getBodyAsStream());
+            $features = \JsonMachine\Items::fromStream($featureStream, array('pointer' => '/features'));
             $data = array();
             foreach ($features as $feat) {
                 if (property_exists($feat, 'properties')

diff --git a/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php b/lizmap/modules/lizmap/lib/Form/QgisFormValueRelationDynamicDatasource.php
@@ -108,15 +108,12 @@ public function getData($form)
                 // Process request
                 $wfsResult = $wfsRequest->process();
 
-                // $data = $wfsResult->getBodyAsString();
+                $code = $wfsResult->getCode();
                 $mime = $wfsResult->getMime();
 
-                if (strpos($mime, 'text/json') === 0
-                    || strpos($mime, 'application/json') === 0
-                    || strpos($mime, 'application/vnd.geo+json') === 0) {
-                    /*$json = json_decode($data);
-                    // Get result from json
-                    $features = $json->features;*/
+                if ($code < 400 && (strpos($mime, 'text/json') === 0
+                                    || strpos($mime, 'application/json') === 0
+                                    || strpos($mime, 'application/vnd.geo+json') === 0)) {
 
                     $featureStream = Psr7\StreamWrapper::getResource($wfsResult->getBodyAsStream());
                     $features = \JsonMachine\Items::fromStream($featureStream, array('pointer' => '/features'));