From b8dce1ee744873bbbc7b3d72bb6167e2f028b4b1 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 11 Jul 2019 10:22:37 +0100
Subject: [PATCH] FIX #11107 TIME 0:05 rm useless files
---
.../models/MessageExchangeModel.php | 19 --
.../models/MessageExchangeModelAbstract.php | 197 ------------------
2 files changed, 216 deletions(-)
delete mode 100755 src/app/external/externalSignatoryBook/models/MessageExchangeModel.php
delete mode 100755 src/app/external/externalSignatoryBook/models/MessageExchangeModelAbstract.php
diff --git a/src/app/external/externalSignatoryBook/models/MessageExchangeModel.php b/src/app/external/externalSignatoryBook/models/MessageExchangeModel.php
deleted file mode 100755
index b3db9181390..00000000000
--- a/src/app/external/externalSignatoryBook/models/MessageExchangeModel.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
-* Copyright Maarch since 2008 under licence GPLv3.
-* See LICENCE.txt file at the root folder for more details.
-* This file is part of Maarch software.
-*
-*/
-
-/**
-* @brief Message Exchange Model
-* @author dev@maarch.org
-*/
-
-namespace MessageExchange\models;
-
-class MessageExchangeModel extends MessageExchangeModelAbstract
-{
-}
diff --git a/src/app/external/externalSignatoryBook/models/MessageExchangeModelAbstract.php b/src/app/external/externalSignatoryBook/models/MessageExchangeModelAbstract.php
deleted file mode 100755
index 577190e2ed4..00000000000
--- a/src/app/external/externalSignatoryBook/models/MessageExchangeModelAbstract.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-/**
- * Copyright Maarch since 2008 under licence GPLv3.
- * See LICENCE.txt file at the root folder for more details.
- * This file is part of Maarch software.
- *
- */
-
-/**
- * @brief User Model
- * @author dev@maarch.org
- */
-
-namespace MessageExchange\models;
-
-use SrcCore\models\DatabaseModel;
-use SrcCore\models\ValidatorModel;
-use Docserver\models\DocserverModel;
-use Docserver\models\DocserverTypeModel;
-use Resource\controllers\StoreController;
-use Docserver\controllers\DocserverController;
-
-abstract class MessageExchangeModelAbstract
-{
- public static function getMessageByReference($aArgs = [])
- {
- ValidatorModel::notEmpty($aArgs, ['reference']);
-
- $aReturn = DatabaseModel::select(
- [
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['message_exchange'],
- 'where' => ['reference = ?'],
- 'data' => [$aArgs['reference']]
- ]
- );
-
- if (empty($aReturn[0])) {
- return [];
- }
-
- return $aReturn;
- }
-
- public static function getMessageByIdentifier($aArgs = [])
- {
- ValidatorModel::notEmpty($aArgs, ['messageId']);
-
- $aReturn = DatabaseModel::select(
- [
- 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
- 'table' => ['message_exchange'],
- 'where' => ['message_id = ?'],
- 'data' => [$aArgs['messageId']]
- ]
- );
-
- if (empty($aReturn[0])) {
- return [];
- }
-
- return $aReturn;
- }
-
- public static function updateStatusMessage(array $aArgs)
- {
- ValidatorModel::notEmpty($aArgs, ['status','reference']);
-
- DatabaseModel::update([
- 'table' => 'message_exchange',
- 'set' => [
- 'status' => $aArgs['status']
- ],
- 'where' => ['reference = ?'],
- 'data' => [$aArgs['reference']]
- ]);
-
- return true;
- }
-
- /*** Generates a local unique identifier
- @return string The unique id*/
- public static function generateUniqueId()
- {
- $parts = explode('.', microtime(true));
- $sec = $parts[0];
- if (!isset($parts[1])) {
- $msec = 0;
- } else {
- $msec = $parts[1];
- }
- $uniqueId = str_pad(base_convert($sec, 10, 36), 6, '0', STR_PAD_LEFT) . str_pad(base_convert($msec, 10, 16), 4, '0', STR_PAD_LEFT);
- $uniqueId .= str_pad(base_convert(mt_rand(), 10, 36), 6, '0', STR_PAD_LEFT);
-
- return $uniqueId;
- }
-
- public static function insertMessage($args = [])
- {
- $messageObject = $args['data'];
- $type = $args['type'];
- $aArgs = $args['dataExtension'];
- $userId = $args['userId'];
-
- if (empty($messageObject->messageId)) {
- $messageObject->messageId = self::generateUniqueId();
- }
-
- if (empty($aArgs['status'])) {
- $status = "sent";
- } else {
- $status = $aArgs['status'];
- }
-
- if (empty($aArgs['fullMessageObject'])) {
- $messageObjectToSave = $messageObject;
- } else {
- $messageObjectToSave = $aArgs['fullMessageObject'];
- }
-
- if (empty($aArgs['resIdMaster'])) {
- $resIdMaster = null;
- } else {
- $resIdMaster = $aArgs['resIdMaster'];
- }
-
- if (empty($aArgs['filePath'])) {
- $filePath = null;
- } else {
- $filePath = $aArgs['filePath'];
- $filesize = filesize($filePath);
-
- //Store resource on docserver
- $resource = file_get_contents($filePath);
- $pathInfo = pathinfo($filePath);
- $storeResult = DocserverController::storeResourceOnDocServer([
- 'collId' => 'archive_transfer_coll',
- 'docserverTypeId' => 'ARCHIVETRANSFER',
- 'encodedResource' => base64_encode($resource),
- 'format' => $pathInfo['extension']
- ]);
-
- if (!empty($storeResult['errors'])) {
- var_dump($storeResult['errors']);
- }
- $docserverId = $storeResult['docserver_id'];
- $filepath = $storeResult['destination_dir'];
- $filename = $storeResult['file_destination_name'];
- $docserver = DocserverModel::getByDocserverId(['docserverId' => $docserverId]);
-
- $docserverType = DocserverTypeModel::getById([
- 'id' => $docserver['docserver_type_id']
- ]);
-
- $fingerprint = StoreController::getFingerPrint([
- 'filePath' => $filePath,
- 'mode' => $docserverType['fingerprint_mode'],
- ]);
- }
-
- try {
- DatabaseModel::insert([
- 'table' => 'message_exchange',
- 'columnsValues' => [
- 'message_id' => $messageObject->messageId,
- 'schema' => "2.1",
- 'type' => $type,
- 'status' => $status,
- 'date' => $messageObject->date,
- 'reference' => $messageObject->MessageIdentifier->value,
- 'account_id' => $userId,
- 'sender_org_identifier' => $messageObject->TransferringAgency->Identifier->value,
- 'sender_org_name' => $aArgs['SenderOrgNAme'],
- 'recipient_org_identifier' => $messageObject->ArchivalAgency->Identifier->value,
- 'recipient_org_name' => $aArgs['RecipientOrgNAme'],
- 'archival_agreement_reference' => $messageObject->ArchivalAgreement->value,
- 'reply_code' => $messageObject->ReplyCode,
- 'size' => '0',
- 'data' => json_encode($messageObjectToSave),
- 'active' => "TRUE",
- 'archived' => "FALSE",
- 'res_id_master' => $resIdMaster,
- 'docserver_id' => $docserverId,
- 'path' => $filepath,
- 'filename' => $filename,
- 'fingerprint' => $fingerprint,
- 'filesize' => $filesize
- ]
- ]);
- } catch (Exception $e) {
- return false;
- }
-
- return $messageObject->messageId;
- }
-}
--
GitLab