From e21b604472d878dd257a626fd3b2cb68b2841d5a Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 20 Jan 2020 18:12:47 +0100
Subject: [PATCH] FEAT #10633 TIME 0:15 Ozwillo uri fix
---
bin/external/ozwillo/OzwilloScript.php | 12 ++++++------
bin/external/ozwillo/config.xml | 13 ++++++++-----
bin/external/ozwillo/ozwillo.sh | 2 +-
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/bin/external/ozwillo/OzwilloScript.php b/bin/external/ozwillo/OzwilloScript.php
index e54bc2c3cf9..5a9a96456a1 100644
--- a/bin/external/ozwillo/OzwilloScript.php
+++ b/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]);
diff --git a/bin/external/ozwillo/config.xml b/bin/external/ozwillo/config.xml
index 959ad8388b7..d60b6cd7f6e 100644
--- a/bin/external/ozwillo/config.xml
+++ b/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>
diff --git a/bin/external/ozwillo/ozwillo.sh b/bin/external/ozwillo/ozwillo.sh
index f2e8bd38662..00bacb93988 100644
--- a/bin/external/ozwillo/ozwillo.sh
+++ b/bin/external/ozwillo/ozwillo.sh
@@ -1,3 +1,3 @@
#!/bin/sh
cd /var/www/html/MaarchCourrier/bin/external/ozwillo/
-php OzwilloScript.php --customId
+php OzwilloScript.php --customId monCustom
--
GitLab