FEAT #10633 TIME 0:15 Ozwillo uri fix

bin/external/ozwillo/OzwilloScript.php

@@ -32,14 +32,14 @@ class OzwilloScript
         if (empty($configuration)) {
             self::writeLog(['message' => "[SEND_FILE] File bin/external/ozwillo/config.xml does not exist"]);
             exit();
-        } elseif (empty($configuration->user) || empty($configuration->password) || empty($configuration->uri) || empty($configuration->triggerStatuses->sendFile)) {
+        } elseif (empty($configuration->user) || empty($configuration->password) || empty($configuration->sendFile->uri) || empty($configuration->sendFile->status)) {
             self::writeLog(['message' => "[SEND_FILE] File bin/external/ozwillo/config.xml is not filled enough"]);
             exit();
         }
         $user = (string)$configuration->user;
         $password = (string)$configuration->password;
-        $uri = (string)$configuration->uri;
-        $status = (string)$configuration->triggerStatuses->sendFile;
+        $uri = (string)$configuration->sendFile->uri;
+        $status = (string)$configuration->sendFile->status;
 
         \SrcCore\models\DatabasePDO::reset();
         new \SrcCore\models\DatabasePDO(['customId' => $customId]);
@@ -108,14 +108,14 @@ class OzwilloScript
         if (empty($configuration)) {
             self::writeLog(['message' => "[SEND_DATA] File bin/external/ozwillo/config.xml does not exist"]);
             exit();
-        } elseif (empty($configuration->user) || empty($configuration->password) || empty($configuration->uri) || empty($configuration->triggerStatuses->sendData)) {
+        } elseif (empty($configuration->user) || empty($configuration->password) || empty($configuration->sendData->uri) || empty($configuration->sendData->status)) {
             self::writeLog(['message' => "[SEND_DATA] File bin/external/ozwillo/config.xml is not filled enough"]);
             exit();
         }
         $user = (string)$configuration->user;
         $password = (string)$configuration->password;
-        $uri = (string)$configuration->uri;
-        $status = (string)$configuration->triggerStatuses->sendData;
+        $uri = (string)$configuration->sendData->uri;
+        $status = (string)$configuration->sendData->status;
 
         \SrcCore\models\DatabasePDO::reset();
         new \SrcCore\models\DatabasePDO(['customId' => $customId]);

bin/external/ozwillo/config.xml

@@ -2,9 +2,12 @@
 <ROOT>
     <user>superadmin</user>
     <password>maarch</password>
-    <uri></uri>
-    <triggerStatuses>
-        <sendFile>OZWILLOSF</sendFile>
-        <sendData>OZWILLOSD</sendData>
-    </triggerStatuses>
+    <sendFile>
+        <uri></uri>
+        <status>OZWILLOSF</status>
+    </sendFile>
+    <sendData>
+        <uri></uri>
+        <status>OZWILLOSD</status>
+    </sendData>
 </ROOT>

bin/external/ozwillo/ozwillo.sh

 #!/bin/sh
 cd /var/www/html/MaarchCourrier/bin/external/ozwillo/
-php OzwilloScript.php --customId
+php OzwilloScript.php --customId monCustom