From ff573a68e7703600be31401adcc06d7982a4b158 Mon Sep 17 00:00:00 2001 From: Alexandre Morin <alexandre.morin@maarch.org> Date: Wed, 28 Jun 2017 14:36:43 +0200 Subject: [PATCH] Fix #5642 Rename module export export_seda --- .../AdapterMaarchCourrier.php | 0 .../{export => export_seda}/AdapterMaarchRM.php | 0 .../{export => export_seda}/Ajax_seda_zip.php | 0 .../Ajax_transfer_SAE.php | 0 .../Ajax_validate_change_status.php | 0 .../{export => export_seda}/Ajax_validation.php | 0 .../CheckAcknowledgement.php | 0 modules/{export => export_seda}/CheckReply.php | 0 .../DOMTemplateProcessor.php | 3 +++ modules/{export => export_seda}/Purge.php | 0 modules/{export => export_seda}/RequestSeda.php | 4 ++-- modules/{export => export_seda}/Reset.php | 0 modules/{export => export_seda}/Transfer.php | 0 modules/{export => export_seda}/Zip.php | 0 .../batch/CheckAllReply.php | 0 .../batch/config/config.xml.default | 0 .../check_acknowledgement.php | 4 ++-- modules/{export => export_seda}/check_reply.php | 4 ++-- .../class/AbstractMessage.php | 0 .../class/Acknowledgement.php | 0 .../class/ArchiveTransfer.php | 0 .../class/ArchiveTransferReply.php | 0 .../export.php => export_seda/export_seda.php} | 16 ++++++++-------- modules/{export => export_seda}/js/functions.js | 0 modules/{export => export_seda}/lang/en.php | 12 ++++++------ modules/{export => export_seda}/lang/fr.php | 12 ++++++------ modules/{export => export_seda}/purge_letter.php | 4 ++-- modules/{export => export_seda}/reset_letter.php | 4 ++-- .../resources/AbstractRule.xml | 0 .../resources/Acknowledgement.xml | 0 .../{export => export_seda}/resources/Agent.xml | 0 .../resources/ArchivalAgreement.xml | 0 .../resources/ArchiveTransfer.xml | 0 .../resources/ArchiveTransferReply.xml | 0 .../resources/ArchiveUnit.xml | 0 .../resources/ArchiveUnitChildren.xml | 0 .../resources/CodeListVersions.xml | 0 .../resources/DataObjectPackage.xml | 0 .../resources/ManagementMetadata.xml | 0 .../resources/MessageIdentifier.xml | 0 .../resources/MessageReceivedIdentifier.xml | 0 .../resources/MessageRequestIdentifier.xml | 0 .../resources/Organization.xml | 0 .../{export => export_seda}/script/checkReply.sh | 2 +- .../xml/IVS/data_types.xml | 0 .../xml/IVS/requests_definitions.xml | 0 .../xml/IVS/validation_rules.xml | 0 .../xml/actions_pages.xml | 16 ++++++++-------- .../xml/config.xml.default | 4 ++-- modules/{export => export_seda}/xml/services.xml | 8 ++++---- 50 files changed, 48 insertions(+), 45 deletions(-) rename modules/{export => export_seda}/AdapterMaarchCourrier.php (100%) rename modules/{export => export_seda}/AdapterMaarchRM.php (100%) rename modules/{export => export_seda}/Ajax_seda_zip.php (100%) rename modules/{export => export_seda}/Ajax_transfer_SAE.php (100%) rename modules/{export => export_seda}/Ajax_validate_change_status.php (100%) rename modules/{export => export_seda}/Ajax_validation.php (100%) rename modules/{export => export_seda}/CheckAcknowledgement.php (100%) rename modules/{export => export_seda}/CheckReply.php (100%) rename modules/{export => export_seda}/DOMTemplateProcessor.php (99%) rename modules/{export => export_seda}/Purge.php (100%) rename modules/{export => export_seda}/RequestSeda.php (99%) rename modules/{export => export_seda}/Reset.php (100%) rename modules/{export => export_seda}/Transfer.php (100%) rename modules/{export => export_seda}/Zip.php (100%) rename modules/{export => export_seda}/batch/CheckAllReply.php (100%) rename modules/{export => export_seda}/batch/config/config.xml.default (100%) rename modules/{export => export_seda}/check_acknowledgement.php (97%) rename modules/{export => export_seda}/check_reply.php (97%) rename modules/{export => export_seda}/class/AbstractMessage.php (100%) rename modules/{export => export_seda}/class/Acknowledgement.php (100%) rename modules/{export => export_seda}/class/ArchiveTransfer.php (100%) rename modules/{export => export_seda}/class/ArchiveTransferReply.php (100%) rename modules/{export/export.php => export_seda/export_seda.php} (91%) rename modules/{export => export_seda}/js/functions.js (100%) rename modules/{export => export_seda}/lang/en.php (94%) rename modules/{export => export_seda}/lang/fr.php (93%) rename modules/{export => export_seda}/purge_letter.php (97%) rename modules/{export => export_seda}/reset_letter.php (97%) rename modules/{export => export_seda}/resources/AbstractRule.xml (100%) rename modules/{export => export_seda}/resources/Acknowledgement.xml (100%) rename modules/{export => export_seda}/resources/Agent.xml (100%) rename modules/{export => export_seda}/resources/ArchivalAgreement.xml (100%) rename modules/{export => export_seda}/resources/ArchiveTransfer.xml (100%) rename modules/{export => export_seda}/resources/ArchiveTransferReply.xml (100%) rename modules/{export => export_seda}/resources/ArchiveUnit.xml (100%) rename modules/{export => export_seda}/resources/ArchiveUnitChildren.xml (100%) rename modules/{export => export_seda}/resources/CodeListVersions.xml (100%) rename modules/{export => export_seda}/resources/DataObjectPackage.xml (100%) rename modules/{export => export_seda}/resources/ManagementMetadata.xml (100%) rename modules/{export => export_seda}/resources/MessageIdentifier.xml (100%) rename modules/{export => export_seda}/resources/MessageReceivedIdentifier.xml (100%) rename modules/{export => export_seda}/resources/MessageRequestIdentifier.xml (100%) rename modules/{export => export_seda}/resources/Organization.xml (100%) rename modules/{export => export_seda}/script/checkReply.sh (51%) rename modules/{export => export_seda}/xml/IVS/data_types.xml (100%) rename modules/{export => export_seda}/xml/IVS/requests_definitions.xml (100%) rename modules/{export => export_seda}/xml/IVS/validation_rules.xml (100%) rename modules/{export => export_seda}/xml/actions_pages.xml (86%) rename modules/{export => export_seda}/xml/config.xml.default (85%) rename modules/{export => export_seda}/xml/services.xml (63%) diff --git a/modules/export/AdapterMaarchCourrier.php b/modules/export_seda/AdapterMaarchCourrier.php similarity index 100% rename from modules/export/AdapterMaarchCourrier.php rename to modules/export_seda/AdapterMaarchCourrier.php diff --git a/modules/export/AdapterMaarchRM.php b/modules/export_seda/AdapterMaarchRM.php similarity index 100% rename from modules/export/AdapterMaarchRM.php rename to modules/export_seda/AdapterMaarchRM.php diff --git a/modules/export/Ajax_seda_zip.php b/modules/export_seda/Ajax_seda_zip.php similarity index 100% rename from modules/export/Ajax_seda_zip.php rename to modules/export_seda/Ajax_seda_zip.php diff --git a/modules/export/Ajax_transfer_SAE.php b/modules/export_seda/Ajax_transfer_SAE.php similarity index 100% rename from modules/export/Ajax_transfer_SAE.php rename to modules/export_seda/Ajax_transfer_SAE.php diff --git a/modules/export/Ajax_validate_change_status.php b/modules/export_seda/Ajax_validate_change_status.php similarity index 100% rename from modules/export/Ajax_validate_change_status.php rename to modules/export_seda/Ajax_validate_change_status.php diff --git a/modules/export/Ajax_validation.php b/modules/export_seda/Ajax_validation.php similarity index 100% rename from modules/export/Ajax_validation.php rename to modules/export_seda/Ajax_validation.php diff --git a/modules/export/CheckAcknowledgement.php b/modules/export_seda/CheckAcknowledgement.php similarity index 100% rename from modules/export/CheckAcknowledgement.php rename to modules/export_seda/CheckAcknowledgement.php diff --git a/modules/export/CheckReply.php b/modules/export_seda/CheckReply.php similarity index 100% rename from modules/export/CheckReply.php rename to modules/export_seda/CheckReply.php diff --git a/modules/export/DOMTemplateProcessor.php b/modules/export_seda/DOMTemplateProcessor.php similarity index 99% rename from modules/export/DOMTemplateProcessor.php rename to modules/export_seda/DOMTemplateProcessor.php index b648b26674d..ecc69be511e 100644 --- a/modules/export/DOMTemplateProcessor.php +++ b/modules/export_seda/DOMTemplateProcessor.php @@ -70,6 +70,9 @@ class DOMTemplateProcessor parent::__construct($document); + $this->xinclude(); + $this->xinclude(); + $this->xinclude(); $this->xinclude(); $this->xinclude(); $this->xinclude(); diff --git a/modules/export/Purge.php b/modules/export_seda/Purge.php similarity index 100% rename from modules/export/Purge.php rename to modules/export_seda/Purge.php diff --git a/modules/export/RequestSeda.php b/modules/export_seda/RequestSeda.php similarity index 99% rename from modules/export/RequestSeda.php rename to modules/export_seda/RequestSeda.php index bdeebd16302..911725901f7 100644 --- a/modules/export/RequestSeda.php +++ b/modules/export_seda/RequestSeda.php @@ -327,8 +327,8 @@ class RequestSeda $queryParams[] = $messageObject->replyCode->value; //ReplyCode $queryParams[] = 0; // size $queryParams[] = json_encode($messageObject);//$messageObject; // Data - $queryParams[] = "Y"; // active - $queryParams[] = "N"; // archived + $queryParams[] = 1; // active + $queryParams[] = 0; // archived $res = $this->db->query($query,$queryParams); diff --git a/modules/export/Reset.php b/modules/export_seda/Reset.php similarity index 100% rename from modules/export/Reset.php rename to modules/export_seda/Reset.php diff --git a/modules/export/Transfer.php b/modules/export_seda/Transfer.php similarity index 100% rename from modules/export/Transfer.php rename to modules/export_seda/Transfer.php diff --git a/modules/export/Zip.php b/modules/export_seda/Zip.php similarity index 100% rename from modules/export/Zip.php rename to modules/export_seda/Zip.php diff --git a/modules/export/batch/CheckAllReply.php b/modules/export_seda/batch/CheckAllReply.php similarity index 100% rename from modules/export/batch/CheckAllReply.php rename to modules/export_seda/batch/CheckAllReply.php diff --git a/modules/export/batch/config/config.xml.default b/modules/export_seda/batch/config/config.xml.default similarity index 100% rename from modules/export/batch/config/config.xml.default rename to modules/export_seda/batch/config/config.xml.default diff --git a/modules/export/check_acknowledgement.php b/modules/export_seda/check_acknowledgement.php similarity index 97% rename from modules/export/check_acknowledgement.php rename to modules/export_seda/check_acknowledgement.php index 9724ba6e938..7a34cd78ace 100644 --- a/modules/export/check_acknowledgement.php +++ b/modules/export_seda/check_acknowledgement.php @@ -10,7 +10,7 @@ /** * @brief Acknowledgement letter * @author dev@maarch.org - * @ingroup export + * @ingroup export seda */ /** @@ -50,7 +50,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $values_str .= $_SESSION['stockCheckbox'][$i] . ', '; } } - $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export"; + $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export_seda"; $values_str = preg_replace('/, $/', '', $values_str); $frm_str ='<center style="font-size:15px;">'._ACTION_CONFIRM.'<br/><br/><b>'.$labelAction.' ?</b></center><br/>'; diff --git a/modules/export/check_reply.php b/modules/export_seda/check_reply.php similarity index 97% rename from modules/export/check_reply.php rename to modules/export_seda/check_reply.php index 4f1ba1facc4..2cee368a1d3 100644 --- a/modules/export/check_reply.php +++ b/modules/export_seda/check_reply.php @@ -10,7 +10,7 @@ /** * @brief reply letter * @author dev@maarch.org - * @ingroup export + * @ingroup export seda */ /** @@ -50,7 +50,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $values_str .= $_SESSION['stockCheckbox'][$i] . ', '; } } - $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export"; + $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export_seda"; $values_str = preg_replace('/, $/', '', $values_str); $frm_str ='<center style="font-size:15px;">'._ACTION_CONFIRM.'<br/><br/><b>'.$labelAction.' ?</b></center><br/>'; diff --git a/modules/export/class/AbstractMessage.php b/modules/export_seda/class/AbstractMessage.php similarity index 100% rename from modules/export/class/AbstractMessage.php rename to modules/export_seda/class/AbstractMessage.php diff --git a/modules/export/class/Acknowledgement.php b/modules/export_seda/class/Acknowledgement.php similarity index 100% rename from modules/export/class/Acknowledgement.php rename to modules/export_seda/class/Acknowledgement.php diff --git a/modules/export/class/ArchiveTransfer.php b/modules/export_seda/class/ArchiveTransfer.php similarity index 100% rename from modules/export/class/ArchiveTransfer.php rename to modules/export_seda/class/ArchiveTransfer.php diff --git a/modules/export/class/ArchiveTransferReply.php b/modules/export_seda/class/ArchiveTransferReply.php similarity index 100% rename from modules/export/class/ArchiveTransferReply.php rename to modules/export_seda/class/ArchiveTransferReply.php diff --git a/modules/export/export.php b/modules/export_seda/export_seda.php similarity index 91% rename from modules/export/export.php rename to modules/export_seda/export_seda.php index 52cb0250e61..e252bafa28f 100644 --- a/modules/export/export.php +++ b/modules/export_seda/export_seda.php @@ -10,7 +10,7 @@ /** * @brief Export seda Action * @author dev@maarch.org -* @ingroup export +* @ingroup export seda */ /** @@ -80,13 +80,15 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module, $frm_str .= viewArchiveUnit($archiveUnit); } - $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export"; + $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export_seda"; $frm_str .= '</div>'; $frm_str .='<div align="center">'; $frm_str .='<input type="button" name="zip" id="zip" class="button" value="'._ZIP.'" onclick="actionSeda(\''.$path_to_script.'&page=Ajax_seda_zip&reference='.$messageObject->messageIdentifier->value.'\',\'zip\');"/>   '; - $frm_str .='<input type="button" name="sendMessage" id="sendMessage" class="button" value="'._SEND_MESSAGE.'" onclick="actionSeda(\''.$path_to_script.'&page=Ajax_transfer_SAE&reference='.$messageObject->messageIdentifier->value.'&resIds='.$result.'\',\'sendMessage\');"/>'; - $frm_str .='</div>'; + if (file_exists(__DIR__.DIRECTORY_SEPARATOR. 'xml' . DIRECTORY_SEPARATOR . "config.xml")) { + $frm_str .= '<input type="button" name="sendMessage" id="sendMessage" class="button" value="' . _SEND_MESSAGE . '" onclick="actionSeda(\'' . $path_to_script . '&page=Ajax_transfer_SAE&reference=' . $messageObject->messageIdentifier->value . '&resIds=' . $result . '\',\'sendMessage\');"/>'; + } + $frm_str .='</div>'; $frm_str .='<div align="center" name="validSend" id="validSend" style="display: none "><input type="button" class="button" name="validateMessage" id="validateMessage" value="'._VALIDATE_MANUAL_DELIVERY.'" onclick="actionSeda(\''.$path_to_script.'&page=Ajax_validate_change_status&reference='.$messageObject->messageIdentifier->value.'\',\'validateMessage\');"/></div>'; } else { @@ -96,11 +98,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module, } //$config = parse_ini_file(__DIR__.'/config.ini'); - $xml = simplexml_load_file(__DIR__.DIRECTORY_SEPARATOR. 'xml' . DIRECTORY_SEPARATOR . "config.xml"); - $urlSAE = (string) $xml->CONFIG->urlSAE; + $frm_str .= '<div align="center" name="valid" id="valid" style="display: none "><br><input type="button" class="button" name="validateReload" id="validateReload" value="' . _VALIDATE . '" onclick="window.location.reload()"/></div>'; + $frm_str .= '<hr />'; - $frm_str .='<div align="center" name="valid" id="valid" style="display: none "><a href="'.$urlSAE.'">'._URLSAE.'</a><span name="nameSAE"></span><br><input type="button" class="button" name="validateReload" id="validateReload" value="'._VALIDATE.'" onclick="window.location.reload()"/></div>'; - $frm_str .='<hr />'; $frm_str .='<div align="center">'; $frm_str .='<input type="button" name="cancel" id="cancel" class="button" value="'._CANCEL.'" onclick="pile_actions.action_pop();destroyModal(\'modal_'.$id_action.'\');"/>'; $frm_str .='</div>'; diff --git a/modules/export/js/functions.js b/modules/export_seda/js/functions.js similarity index 100% rename from modules/export/js/functions.js rename to modules/export_seda/js/functions.js diff --git a/modules/export/lang/en.php b/modules/export_seda/lang/en.php similarity index 94% rename from modules/export/lang/en.php rename to modules/export_seda/lang/en.php index a7220a66cc6..df78e68698b 100644 --- a/modules/export/lang/en.php +++ b/modules/export_seda/lang/en.php @@ -1,13 +1,13 @@ <?php -if (!defined("_EXPORT_COMMENT")) - define("_EXPORT_COMMENT", "Export"); +if (!defined("_EXPORT_SEDA_COMMENT")) + define("_EXPORT_SEDA_COMMENT", "Export"); -if (!defined("_EXPORT")) - define("_EXPORT", "Export"); +if (!defined("_EXPORT_SEDA")) + define("_EXPORT_SEDA", "Export"); -if (!defined("_EXPORT_VIEW")) - define("_EXPORT_VIEW", "See message export"); +if (!defined("_EXPORT_SEDA_VIEW")) + define("_EXPORT_SEDA_VIEW", "See message export"); if (!defined("_INFORMATION_MESSAGE")) define("_INFORMATION_MESSAGE", "Information message"); diff --git a/modules/export/lang/fr.php b/modules/export_seda/lang/fr.php similarity index 93% rename from modules/export/lang/fr.php rename to modules/export_seda/lang/fr.php index 008031282a5..efca4350aa3 100644 --- a/modules/export/lang/fr.php +++ b/modules/export_seda/lang/fr.php @@ -1,10 +1,10 @@ <?php -if (!defined("_EXPORT_COMMENT")) - define("_EXPORT_COMMENT", "Export"); +if (!defined("_EXPORTSEDA_COMMENT")) + define("_EXPORT_SEDA_COMMENT", "Export"); -if (!defined("_EXPORT")) - define("_EXPORT","Transferer vos courriers"); +if (!defined("_EXPORT_SEDA")) + define("_EXPORT_SEDA","Transferer vos courriers"); if (!defined("_CHECK_ACKNOWLEDGEMENT")) define("_CHECK_ACKNOWLEDGEMENT","Vérification de l'accusé de reception"); if (!defined("_CHECK_REPLY")) @@ -15,8 +15,8 @@ if (!defined("_RESET_LETTER")) define("_RESET_LETTER","Remise à zéro du circuit de traitement"); -if (!defined("_EXPORT_VIEW")) - define("_EXPORT_VIEW", "Voir le bordereau"); +if (!defined("_EXPORT_SEDA_VIEW")) + define("_EXPORT_SEDA_VIEW", "Voir le bordereau"); if (!defined("_INFORMATION_MESSAGE")) define("_INFORMATION_MESSAGE", "Information bordereau"); diff --git a/modules/export/purge_letter.php b/modules/export_seda/purge_letter.php similarity index 97% rename from modules/export/purge_letter.php rename to modules/export_seda/purge_letter.php index a1aa8421150..5f898ecd6de 100644 --- a/modules/export/purge_letter.php +++ b/modules/export_seda/purge_letter.php @@ -10,7 +10,7 @@ /** * @brief purge letter * @author dev@maarch.org -* @ingroup export +* @ingroup export seda */ /** @@ -50,7 +50,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $values_str .= $_SESSION['stockCheckbox'][$i] . ', '; } } - $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export"; + $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export_seda"; $values_str = preg_replace('/, $/', '', $values_str); $frm_str ='<center style="font-size:15px;">'._ACTION_CONFIRM.'<br/><br/><b>'.$labelAction.' ?</b></center><br/>'; diff --git a/modules/export/reset_letter.php b/modules/export_seda/reset_letter.php similarity index 97% rename from modules/export/reset_letter.php rename to modules/export_seda/reset_letter.php index bd34bce188d..5a2eba86f6b 100644 --- a/modules/export/reset_letter.php +++ b/modules/export_seda/reset_letter.php @@ -10,7 +10,7 @@ /** * @brief reset letter * @author dev@maarch.org - * @ingroup export + * @ingroup export seda */ /** @@ -50,7 +50,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $values_str .= $_SESSION['stockCheckbox'][$i] . ', '; } } - $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export"; + $path_to_script = $_SESSION['config']['businessappurl']."index.php?display=true&module=export_seda"; $values_str = preg_replace('/, $/', '', $values_str); $frm_str ='<center style="font-size:15px;">'._ACTION_CONFIRM.'<br/><br/><b>'.$labelAction.' ?</b></center><br/>'; diff --git a/modules/export/resources/AbstractRule.xml b/modules/export_seda/resources/AbstractRule.xml similarity index 100% rename from modules/export/resources/AbstractRule.xml rename to modules/export_seda/resources/AbstractRule.xml diff --git a/modules/export/resources/Acknowledgement.xml b/modules/export_seda/resources/Acknowledgement.xml similarity index 100% rename from modules/export/resources/Acknowledgement.xml rename to modules/export_seda/resources/Acknowledgement.xml diff --git a/modules/export/resources/Agent.xml b/modules/export_seda/resources/Agent.xml similarity index 100% rename from modules/export/resources/Agent.xml rename to modules/export_seda/resources/Agent.xml diff --git a/modules/export/resources/ArchivalAgreement.xml b/modules/export_seda/resources/ArchivalAgreement.xml similarity index 100% rename from modules/export/resources/ArchivalAgreement.xml rename to modules/export_seda/resources/ArchivalAgreement.xml diff --git a/modules/export/resources/ArchiveTransfer.xml b/modules/export_seda/resources/ArchiveTransfer.xml similarity index 100% rename from modules/export/resources/ArchiveTransfer.xml rename to modules/export_seda/resources/ArchiveTransfer.xml diff --git a/modules/export/resources/ArchiveTransferReply.xml b/modules/export_seda/resources/ArchiveTransferReply.xml similarity index 100% rename from modules/export/resources/ArchiveTransferReply.xml rename to modules/export_seda/resources/ArchiveTransferReply.xml diff --git a/modules/export/resources/ArchiveUnit.xml b/modules/export_seda/resources/ArchiveUnit.xml similarity index 100% rename from modules/export/resources/ArchiveUnit.xml rename to modules/export_seda/resources/ArchiveUnit.xml diff --git a/modules/export/resources/ArchiveUnitChildren.xml b/modules/export_seda/resources/ArchiveUnitChildren.xml similarity index 100% rename from modules/export/resources/ArchiveUnitChildren.xml rename to modules/export_seda/resources/ArchiveUnitChildren.xml diff --git a/modules/export/resources/CodeListVersions.xml b/modules/export_seda/resources/CodeListVersions.xml similarity index 100% rename from modules/export/resources/CodeListVersions.xml rename to modules/export_seda/resources/CodeListVersions.xml diff --git a/modules/export/resources/DataObjectPackage.xml b/modules/export_seda/resources/DataObjectPackage.xml similarity index 100% rename from modules/export/resources/DataObjectPackage.xml rename to modules/export_seda/resources/DataObjectPackage.xml diff --git a/modules/export/resources/ManagementMetadata.xml b/modules/export_seda/resources/ManagementMetadata.xml similarity index 100% rename from modules/export/resources/ManagementMetadata.xml rename to modules/export_seda/resources/ManagementMetadata.xml diff --git a/modules/export/resources/MessageIdentifier.xml b/modules/export_seda/resources/MessageIdentifier.xml similarity index 100% rename from modules/export/resources/MessageIdentifier.xml rename to modules/export_seda/resources/MessageIdentifier.xml diff --git a/modules/export/resources/MessageReceivedIdentifier.xml b/modules/export_seda/resources/MessageReceivedIdentifier.xml similarity index 100% rename from modules/export/resources/MessageReceivedIdentifier.xml rename to modules/export_seda/resources/MessageReceivedIdentifier.xml diff --git a/modules/export/resources/MessageRequestIdentifier.xml b/modules/export_seda/resources/MessageRequestIdentifier.xml similarity index 100% rename from modules/export/resources/MessageRequestIdentifier.xml rename to modules/export_seda/resources/MessageRequestIdentifier.xml diff --git a/modules/export/resources/Organization.xml b/modules/export_seda/resources/Organization.xml similarity index 100% rename from modules/export/resources/Organization.xml rename to modules/export_seda/resources/Organization.xml diff --git a/modules/export/script/checkReply.sh b/modules/export_seda/script/checkReply.sh similarity index 51% rename from modules/export/script/checkReply.sh rename to modules/export_seda/script/checkReply.sh index fcebb414a19..bdf3bad8a95 100644 --- a/modules/export/script/checkReply.sh +++ b/modules/export_seda/script/checkReply.sh @@ -1,4 +1,4 @@ #!/bin/sh path='/var/www/html/maarch_courrier' cd $path -php './modules/export/batch/CheckAllReply.php' \ No newline at end of file +php './modules/export_seda/batch/CheckAllReply.php' \ No newline at end of file diff --git a/modules/export/xml/IVS/data_types.xml b/modules/export_seda/xml/IVS/data_types.xml similarity index 100% rename from modules/export/xml/IVS/data_types.xml rename to modules/export_seda/xml/IVS/data_types.xml diff --git a/modules/export/xml/IVS/requests_definitions.xml b/modules/export_seda/xml/IVS/requests_definitions.xml similarity index 100% rename from modules/export/xml/IVS/requests_definitions.xml rename to modules/export_seda/xml/IVS/requests_definitions.xml diff --git a/modules/export/xml/IVS/validation_rules.xml b/modules/export_seda/xml/IVS/validation_rules.xml similarity index 100% rename from modules/export/xml/IVS/validation_rules.xml rename to modules/export_seda/xml/IVS/validation_rules.xml diff --git a/modules/export/xml/actions_pages.xml b/modules/export_seda/xml/actions_pages.xml similarity index 86% rename from modules/export/xml/actions_pages.xml rename to modules/export_seda/xml/actions_pages.xml index c9b9e4e7cf9..a9648fdff56 100644 --- a/modules/export/xml/actions_pages.xml +++ b/modules/export_seda/xml/actions_pages.xml @@ -13,11 +13,11 @@ An action page is described in a ACTIONPAGE tag : --> <ROOT> <ACTIONPAGE> - <ID>export</ID> - <LABEL>_EXPORT</LABEL> - <NAME>export</NAME> + <ID>export_seda</ID> + <LABEL>_EXPORT_SEDA</LABEL> + <NAME>export_seda</NAME> <ORIGIN>module</ORIGIN> - <MODULE>export</MODULE> + <MODULE>export_seda</MODULE> <FLAG_CREATE>false</FLAG_CREATE> <COLLECTIONS> <COLL_ID>letterbox_coll</COLL_ID> @@ -28,7 +28,7 @@ An action page is described in a ACTIONPAGE tag : <LABEL>_CHECK_ACKNOWLEDGEMENT</LABEL> <NAME>check_acknowledgement</NAME> <ORIGIN>module</ORIGIN> - <MODULE>export</MODULE> + <MODULE>export_seda</MODULE> <FLAG_CREATE>false</FLAG_CREATE> <COLLECTIONS> <COLL_ID>letterbox_coll</COLL_ID> @@ -39,7 +39,7 @@ An action page is described in a ACTIONPAGE tag : <LABEL>_CHECK_REPLY</LABEL> <NAME>check_reply</NAME> <ORIGIN>module</ORIGIN> - <MODULE>export</MODULE> + <MODULE>export_seda</MODULE> <FLAG_CREATE>false</FLAG_CREATE> <COLLECTIONS> <COLL_ID>letterbox_coll</COLL_ID> @@ -50,7 +50,7 @@ An action page is described in a ACTIONPAGE tag : <LABEL>_PURGE_LETTER</LABEL> <NAME>purge_letter</NAME> <ORIGIN>module</ORIGIN> - <MODULE>export</MODULE> + <MODULE>export_seda</MODULE> <FLAG_CREATE>false</FLAG_CREATE> <COLLECTIONS> <COLL_ID>letterbox_coll</COLL_ID> @@ -61,7 +61,7 @@ An action page is described in a ACTIONPAGE tag : <LABEL>_RESET_LETTER</LABEL> <NAME>reset_letter</NAME> <ORIGIN>module</ORIGIN> - <MODULE>export</MODULE> + <MODULE>export_seda</MODULE> <FLAG_CREATE>false</FLAG_CREATE> <COLLECTIONS> <COLL_ID>letterbox_coll</COLL_ID> diff --git a/modules/export/xml/config.xml.default b/modules/export_seda/xml/config.xml.default similarity index 85% rename from modules/export/xml/config.xml.default rename to modules/export_seda/xml/config.xml.default index 1f1bddb5f63..23af5be2b8c 100644 --- a/modules/export/xml/config.xml.default +++ b/modules/export_seda/xml/config.xml.default @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <root> <CONFIG> - <name>export</name> - <comment>_EXPORT_COMMENT</comment> + <name>export_seda</name> + <comment>_EXPORT_SEDA_COMMENT</comment> <file_prefix>seda</file_prefix> <loaded>true</loaded> <sae>MaarchRM</sae> diff --git a/modules/export/xml/services.xml b/modules/export_seda/xml/services.xml similarity index 63% rename from modules/export/xml/services.xml rename to modules/export_seda/xml/services.xml index d7b605256c2..e93e9eed9fa 100644 --- a/modules/export/xml/services.xml +++ b/modules/export_seda/xml/services.xml @@ -1,10 +1,10 @@ <?xml version="1.0" ?> <root> <SERVICE> - <id>export_view</id> - <name>_EXPORT_VIEW</name> - <comment>_EXPORT_DESC</comment> - <servicepage>export_view.php</servicepage> + <id>export_seda_view</id> + <name>_EXPORT_SEDA_VIEW</name> + <comment>_EXPORT_SEDA_DESC</comment> + <servicepage>export_seda_view.php</servicepage> <servicetype>use</servicetype> <system_service>false</system_service> <enabled>true</enabled> -- GitLab