diff --git a/modules/export_seda/CheckReply.php b/modules/export_seda/CheckReply.php
index 8a53508ba1e4058c704e89675cde7dd0c33fd631..e117cc59c399aca67fa399126551fb8d32a5da29 100755
--- a/modules/export_seda/CheckReply.php
+++ b/modules/export_seda/CheckReply.php
@@ -4,7 +4,8 @@ require_once __DIR__ . '/RequestSeda.php';
require_once __DIR__ . '/class/AbstractMessage.php';
require_once __DIR__ . '/class/ArchiveTransferReply.php';
-Class CheckReply {
+class CheckReply
+{
protected $token;
protected $SAE;
protected $db;
@@ -19,14 +20,13 @@ Class CheckReply {
. $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'modules'
. DIRECTORY_SEPARATOR . 'export_seda'. DIRECTORY_SEPARATOR . 'xml'
. DIRECTORY_SEPARATOR . 'config.xml'
- ))
- {
+ )) {
$path = $_SESSION['config']['corepath'] . 'custom' . DIRECTORY_SEPARATOR
. $_SESSION['custom_override_id'] . DIRECTORY_SEPARATOR . 'modules'
. DIRECTORY_SEPARATOR . 'export_seda'. DIRECTORY_SEPARATOR . 'xml'
. DIRECTORY_SEPARATOR . 'config.xml';
$getXml = true;
- } else if (file_exists($_SESSION['config']['corepath'] . 'modules' . DIRECTORY_SEPARATOR . 'export_seda'. DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'config.xml')) {
+ } elseif (file_exists($_SESSION['config']['corepath'] . 'modules' . DIRECTORY_SEPARATOR . 'export_seda'. DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'config.xml')) {
$path = $_SESSION['config']['corepath'] . 'modules' . DIRECTORY_SEPARATOR . 'export_seda'
. DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'config.xml';
$getXml = true;
@@ -41,7 +41,6 @@ Class CheckReply {
$this->token = "LAABS-AUTH=". $tokenEncode;
$this->urlService = (string) $this->xml->CONFIG->urlSAEService . "/medona/message/reference";
$this->db = new RequestSeda();
-
}
public function checkAll()
@@ -55,7 +54,7 @@ Class CheckReply {
$unitIdentifier = $this->db->getUnitIdentifierByResId($letter->res_id);
$message = $this->db->getMessageByIdentifier($unitIdentifier->message_id);
- if(array_key_exists($message->reference, $unitIdentifiers)) {
+ if (array_key_exists($message->reference, $unitIdentifiers)) {
$unitIdentifiers[$message->reference] .= "," . $unitIdentifier->res_id;
} else {
$unitIdentifiers[$message->reference] = $unitIdentifier->res_id;
@@ -81,14 +80,15 @@ Class CheckReply {
return true;
}
- public function checkAttachment($resId) {
+ public function checkAttachment($resId)
+ {
$reply = $this->db->getReply($resId);
if (!$reply) {
$_SESSION['error'] = _ERROR_NO_REPLY . $resId;
return false;
}
- $tabDir = explode('#',$reply->path);
+ $tabDir = explode('#', $reply->path);
$dir = '';
for ($i = 0; $i < count($tabDir); $i++) {
@@ -120,7 +120,8 @@ Class CheckReply {
return $resId;
}
- public function getReply($reference) {
+ public function getReply($reference)
+ {
$header = [
'accept:application/json',
'content-type:application/json',
diff --git a/modules/export_seda/RequestSeda.php b/modules/export_seda/RequestSeda.php
index 259c9b2b463c9b896888ecf47d900391948380b5..6be3ceef6a43844135a90c785214d08e73a5d14f 100755
--- a/modules/export_seda/RequestSeda.php
+++ b/modules/export_seda/RequestSeda.php
@@ -616,11 +616,6 @@ class RequestSeda
$storeResult = array();
- /*$storeResult = $docserverControler->storeResourceOnDocserver(
- $_SESSION['collection_id_choice'],
- $fileInfos
- );*/
-
$resource = file_get_contents($data->tmpDir . '/' . $data->tmpFileName);
$pathInfo = pathinfo($data->tmpDir . '/' . $data->tmpFileName);
$storeResult = \Docserver\controllers\DocserverController::storeResourceOnDocServer([
diff --git a/modules/export_seda/check_acknowledgement.php b/modules/export_seda/check_acknowledgement.php
index 7a34cd78ace5165513d1e8fe65dc49461f8f1f12..945ef28e57ab0200d9f5aae37c2d575247e0eeff 100755
--- a/modules/export_seda/check_acknowledgement.php
+++ b/modules/export_seda/check_acknowledgement.php
@@ -27,9 +27,8 @@ $etapes = array('form');
$frm_width='285px';
$frm_height = 'auto';
-function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode )
+function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode)
{
-
$res_id = $values[0];
$db = new Database();
$labelAction = '';
@@ -45,7 +44,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$values_str .= $values[$i] . ', ';
}
} else {
-
for ($i = 0; $i < count($_SESSION['stockCheckbox']); $i++) {
$values_str .= $_SESSION['stockCheckbox'][$i] . ', ';
}
@@ -61,9 +59,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .='</form>';
$frm_str .='</div>';
$frm_str .='<div align="center">';
- $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=acknowledgement&reference='.$values_str.'\');" />';
+ $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=acknowledgement&reference='.$values_str.'\', \''. $_SESSION['urlV2Basket']['userId'] .'\', \''. $_SESSION['urlV2Basket']['groupIdSer'] .'\', \''. $_SESSION['urlV2Basket']['basketId'] .'\');" />';
$frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>';
$frm_str .='</div>';
return addslashes($frm_str);
-}
\ No newline at end of file
+}
diff --git a/modules/export_seda/check_reply.php b/modules/export_seda/check_reply.php
index 2cee368a1d38a4ce33f467367360117186e0b135..1bb340b5830db755cbf0bcb0adaad153d4db9bb4 100755
--- a/modules/export_seda/check_reply.php
+++ b/modules/export_seda/check_reply.php
@@ -27,9 +27,8 @@ $etapes = array('form');
$frm_width='285px';
$frm_height = 'auto';
-function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode )
+function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode)
{
-
$res_id = $values[0];
$db = new Database();
$labelAction = '';
@@ -45,7 +44,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$values_str .= $values[$i] . ', ';
}
} else {
-
for ($i = 0; $i < count($_SESSION['stockCheckbox']); $i++) {
$values_str .= $_SESSION['stockCheckbox'][$i] . ', ';
}
@@ -61,9 +59,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .='</form>';
$frm_str .='</div>';
$frm_str .='<div align="center">';
- $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=reply&reference='.$values_str.'\');" />';
+ $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=reply&reference='.$values_str.'\', \''. $_SESSION['urlV2Basket']['userId'] .'\', \''. $_SESSION['urlV2Basket']['groupIdSer'] .'\', \''. $_SESSION['urlV2Basket']['basketId'] .'\');" />';
$frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>';
$frm_str .='</div>';
return addslashes($frm_str);
-}
\ No newline at end of file
+}
diff --git a/modules/export_seda/js/functions.js b/modules/export_seda/js/functions.js
index ce6fc25be1cbfd31ef54e1cc671faf1c1820b073..b09c37696d3b5c2cbd9e04714db683498942a6bd 100755
--- a/modules/export_seda/js/functions.js
+++ b/modules/export_seda/js/functions.js
@@ -57,7 +57,7 @@ function actionSeda(path,type) {
);
}
-function actionValidation(path, aUrlBasket) {
+function actionValidation(path, userId, groupIdSer, basketId) {
new Ajax.Request(path,
{
method:'post',
@@ -69,7 +69,7 @@ function actionValidation(path, aUrlBasket) {
} else {
alert(response.error);
}
- triggerAngular('#/basketList/users/' + aUrlBasket['userId'] + '/groups/' + aUrlBasket['groupIdSer'] + '/baskets/' + aUrlBasket['basketId']);
+ triggerAngular('#/basketList/users/' + userId + '/groups/' + groupIdSer + '/baskets/' + basketId);
}
});
}
diff --git a/modules/export_seda/purge_letter.php b/modules/export_seda/purge_letter.php
index 8166ebebbfbfeddb0a5e2ee39bc5978de47d881a..2559cac1a13094304f9ebc33e3246e5c86fc1428 100755
--- a/modules/export_seda/purge_letter.php
+++ b/modules/export_seda/purge_letter.php
@@ -27,9 +27,8 @@ $etapes = array('form');
$frm_width='285px';
$frm_height = 'auto';
-function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode )
+function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode)
{
-
$res_id = $values[0];
$db = new Database();
$labelAction = '';
@@ -45,7 +44,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$values_str .= $values[$i] . ', ';
}
} else {
-
for ($i = 0; $i < count($_SESSION['stockCheckbox']); $i++) {
$values_str .= $_SESSION['stockCheckbox'][$i] . ', ';
}
@@ -61,9 +59,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .='</form>';
$frm_str .='</div>';
$frm_str .='<div align="center">';
- $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=purge&reference='.$values_str.'\', '. $_SESSION['urlV2Basket'] .');" />';
+ $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=purge&reference='.$values_str.'\', \''. $_SESSION['urlV2Basket']['userId'] .'\', \''. $_SESSION['urlV2Basket']['groupIdSer'] .'\', \''. $_SESSION['urlV2Basket']['basketId'] .'\');" />';
$frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>';
$frm_str .='</div>';
return addslashes($frm_str);
-}
\ No newline at end of file
+}
diff --git a/modules/export_seda/reset_letter.php b/modules/export_seda/reset_letter.php
index 5a2eba86f6bda710f595f28730edf0305a62ae7b..08d58128784d6864b7fd5f69f179889762ef7e9d 100755
--- a/modules/export_seda/reset_letter.php
+++ b/modules/export_seda/reset_letter.php
@@ -27,9 +27,8 @@ $etapes = array('form');
$frm_width='285px';
$frm_height = 'auto';
-function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode )
+function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $coll_id, $mode)
{
-
$res_id = $values[0];
$db = new Database();
$labelAction = '';
@@ -45,7 +44,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$values_str .= $values[$i] . ', ';
}
} else {
-
for ($i = 0; $i < count($_SESSION['stockCheckbox']); $i++) {
$values_str .= $_SESSION['stockCheckbox'][$i] . ', ';
}
@@ -61,9 +59,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .='</form>';
$frm_str .='</div>';
$frm_str .='<div align="center">';
- $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=reset&reference='.$values_str.'\');" />';
+ $frm_str .=' <input type="button" name="redirect_dep" value="'._VALIDATE.'" id="redirect_dep" class="button" onclick="actionValidation(\''.$path_to_script.'&page=Ajax_validation&type=reset&reference='.$values_str.'\', \''. $_SESSION['urlV2Basket']['userId'] .'\', \''. $_SESSION['urlV2Basket']['groupIdSer'] .'\', \''. $_SESSION['urlV2Basket']['basketId'] .'\');" />';
$frm_str .=' <input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();actions_status.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>';
$frm_str .='</div>';
return addslashes($frm_str);
-}
\ No newline at end of file
+}
diff --git a/modules/export_seda/xml/config.xml b/modules/export_seda/xml/config.xml
index 74434da60a038f54bb279b9da6b458d77982db32..ba452e0304e364f2b444afe335d15af36d39b81d 100755
--- a/modules/export_seda/xml/config.xml
+++ b/modules/export_seda/xml/config.xml
@@ -7,7 +7,7 @@
<loaded>true</loaded>
<sae>MaarchRM</sae>
<token>phdF9WkJuTKkDuPXoqDZuCFEQT7En7YqsVROsdD1HoNZV7jD5+XyCrrA61NWmmXVWU7AR5Sw+wq9eazIrIiGnLNDPB6BqMMum8fauclhcR2nklsEdTlveHjcGp/WIDlQ</token>
- <urlSAEService>http://demo-ap.maarchrm.com:81</urlSAEService>
+ <urlSAEService>https://demo-ap.maarchrm.com</urlSAEService>
<urlSAE>https://demo-ap.maarchrm.com/transfer/sent</urlSAE>
<directoryMessage>/tmp/</directoryMessage>
<senderOrgRegNumber>org_987654321_DGS_SA</senderOrgRegNumber>