From 99e7a975918b95dd25825c85ebf954b0ce9ab182 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 30 Apr 2019 17:39:26 +0100
Subject: [PATCH] FEAT #10460 TIME 1 clean model V1 sendmail
---
INSTALL.TXT | 2 +-
README.md | 12 ++---
modules/sendmail/Models/MailModel.php | 22 ---------
modules/sendmail/Models/MailModelAbstract.php | 45 -------------------
4 files changed, 7 insertions(+), 74 deletions(-)
delete mode 100755 modules/sendmail/Models/MailModel.php
delete mode 100755 modules/sendmail/Models/MailModelAbstract.php
diff --git a/INSTALL.TXT b/INSTALL.TXT
index 64037010cd8..6fb612d0368 100755
--- a/INSTALL.TXT
+++ b/INSTALL.TXT
@@ -1,2 +1,2 @@
Documentation d'installation :
- https://docs.maarch.org/gitbook/html/MaarchCourrier/18.10/guat/guat_installation/debian.html
+ https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_installation/debian.html
diff --git a/README.md b/README.md
index 816d9795c8a..df17fe10942 100755
--- a/README.md
+++ b/README.md
@@ -6,25 +6,25 @@
# Maarch Courrier
Gestionnaire Électronique de Correspondances – Libre et Open Source –
-**Dernière version stable V18.10**
+**Dernière version stable V19.04**
Démonstration : http://demo.maarchcourrier.com/
-Documentation : https://docs.maarch.org/gitbook/html/MaarchCourrier/18.10/
+Documentation : https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/
## Installation
-1. Vérifiez que vous avez l'ensemble des [pré-requis](https://docs.maarch.org/gitbook/html/MaarchCourrier/18.10/guat/guat_prerequisites/home.html)
-2. Décompressez *MaarchCourrier-18.10.tar.gz* dans votre zone web
+1. Vérifiez que vous avez l'ensemble des [pré-requis](https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_prerequisites/home.html)
+2. Décompressez *MaarchCourrier-19.04.tar.gz* dans votre zone web
3. Vérifiez votre vhost Apache
-4. Laissez-vous guider par notre installeur à [http://IP.ouDomaine.tld/MaarchCourrier/install/](https://docs.maarch.org/gitbook/html/MaarchCourrier/18.10/guat/guat_installation/online_install.html)
+4. Laissez-vous guider par notre installeur à [http://IP.ouDomaine.tld/MaarchCourrier/install/](https://docs.maarch.org/gitbook/html/MaarchCourrier/19.04/guat/guat_installation/online_install.html)
## Requis techniques
* Apache2.x
* PostgreSQL 9.x
-* PHP 7.0.* ou PHP 7.1.*
+* PHP 7.0, 7.1, 7.2. 7.3
* Extensions PHP (adaptées à votre version de PHP) : PHP-[XSL](http://php.net/manual/en/book.xsl.php), PHP-[XML-RPC](http://php.net/manual/en/book.xmlrpc.php), PHP-[Gettext](http://php.net/manual/en/b$
* Bibliothèques pear/CLITools
* [ImageMagick](http://imagemagick.org/), avec PHP-[ImageMagick](http://php.net/manual/en/book.imagick.php)
diff --git a/modules/sendmail/Models/MailModel.php b/modules/sendmail/Models/MailModel.php
deleted file mode 100755
index 306e04565db..00000000000
--- a/modules/sendmail/Models/MailModel.php
+++ /dev/null
@@ -1,22 +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 mail Model
- * @author dev@maarch.org
- * @ingroup sendmail
- */
-
-namespace Sendmail\Models;
-
-class MailModel extends MailModelAbstract
-{
- // Do your stuff in this class
-}
diff --git a/modules/sendmail/Models/MailModelAbstract.php b/modules/sendmail/Models/MailModelAbstract.php
deleted file mode 100755
index c948dd9a1c4..00000000000
--- a/modules/sendmail/Models/MailModelAbstract.php
+++ /dev/null
@@ -1,45 +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 Mail Model
-* @author dev@maarch.org
-* @ingroup sendmail
-*/
-
-namespace Sendmail\Models;
-
-class MailModelAbstract
-{
- public static function createMail($data)
- {
- try {
- \SrcCore\models\DatabaseModel::insert([
- 'table' => 'sendmail',
- 'columnsValues' => [
- 'coll_id' => $data->coll_id,
- 'res_id' => $data->res_id,
- 'user_id' => $data->user_id,
- 'to_list' => $data->to_list,
- 'cc_list' => $data->cc_list,
- 'cci_list' => $data->cci_list,
- 'email_object' => $data->email_object,
- 'email_body' => $data->email_body,
- 'is_res_master_attached' => $data->is_res_master_attached,
- 'email_status' => $data->email_status,
- 'creation_date' => $data->creation_date,
- 'sender_email' => $data->sender_email,
- 'message_exchange_id' => $data->message_exchange_id,
- ]
- ]);
- } catch (Exception $e) {
- return false;
- }
- }
-}
--
GitLab