From 6dc9202c9042b221d0930fd8c342a5567f56822d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 11 Jan 2008 17:28:01 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20La=20librairie=20dolibarrmail.class.php?=
=?UTF-8?q?=20etant=20specifique=20au=20module=20telephonie=20(ne=20doit?=
=?UTF-8?q?=20pas=20etre=20utilis=E9=20par=20les=20autres=20car=20CMailfil?=
=?UTF-8?q?e=20fait=20la=20meme=20chose=20en=20mieux=20et=20en=20respectan?=
=?UTF-8?q?t=20les=20standard=20SMTP),=20elle=20est=20mise=20dans=20le=20r?=
=?UTF-8?q?ep=20telephonie.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/telephonie/contrat/fiche.php | 2 +-
htdocs/telephonie/contrat/info.php | 2 +-
htdocs/{lib => telephonie}/dolibarrmail.class.php | 2 +-
htdocs/telephonie/facturation/FacturationEmission.class.php | 2 +-
.../telephonie/fournisseur/commande/commande.tableur.class.php | 2 +-
htdocs/telephonie/fournisseur/commande/commande.text.class.php | 2 +-
htdocs/telephonie/fournisseur/commande/commande.textp.class.php | 2 +-
htdocs/telephonie/fournisseur/commande/commande.web.class.php | 2 +-
htdocs/telephonie/ligne/commande/commandetableur.class.php | 2 +-
htdocs/telephonie/ligne/fiche.php | 2 +-
htdocs/telephonie/script/api/presel-view.php | 2 +-
htdocs/telephonie/script/commande_presel_statut.php | 2 +-
htdocs/telephonie/script/envoi-emails-speciaux.php | 2 +-
htdocs/telephonie/script/facturation-alerte.php | 2 +-
htdocs/telephonie/script/facturation-emission.php | 2 +-
htdocs/telephonie/script/facturation-impression.php | 2 +-
htdocs/telephonie/script/presel_active_view.php | 2 +-
htdocs/telephonie/script/recap-commande-week.php | 2 +-
htdocs/telephonie/script/recap-commande.php | 2 +-
htdocs/telephonie/script/retour-traitement.php | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
rename htdocs/{lib => telephonie}/dolibarrmail.class.php (99%)
diff --git a/htdocs/telephonie/contrat/fiche.php b/htdocs/telephonie/contrat/fiche.php
index 864a30383b8..a08dd244578 100644
--- a/htdocs/telephonie/contrat/fiche.php
+++ b/htdocs/telephonie/contrat/fiche.php
@@ -21,7 +21,7 @@
*/
require "./pre.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
$mesg = '';
diff --git a/htdocs/telephonie/contrat/info.php b/htdocs/telephonie/contrat/info.php
index 65a44c89f8d..c3c798ec75b 100644
--- a/htdocs/telephonie/contrat/info.php
+++ b/htdocs/telephonie/contrat/info.php
@@ -21,7 +21,7 @@
*/
require "./pre.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
$mesg = '';
diff --git a/htdocs/lib/dolibarrmail.class.php b/htdocs/telephonie/dolibarrmail.class.php
similarity index 99%
rename from htdocs/lib/dolibarrmail.class.php
rename to htdocs/telephonie/dolibarrmail.class.php
index f5629aa2b41..83233600aab 100644
--- a/htdocs/lib/dolibarrmail.class.php
+++ b/htdocs/telephonie/dolibarrmail.class.php
@@ -25,7 +25,7 @@
*/
/**
- \file htdocs/lib/dolibarrmail.class.php
+ \file htdocs/telephonie/dolibarrmail.class.php
\brief Classe permettant d'envoyer des mail avec attachements, reecriture de CMailFile
\author Dan Potter.
\author Eric Seigne
diff --git a/htdocs/telephonie/facturation/FacturationEmission.class.php b/htdocs/telephonie/facturation/FacturationEmission.class.php
index 157e94d7b14..bd926961b02 100644
--- a/htdocs/telephonie/facturation/FacturationEmission.class.php
+++ b/htdocs/telephonie/facturation/FacturationEmission.class.php
@@ -34,7 +34,7 @@
require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/facturetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/telephonie.contrat.class.php");
diff --git a/htdocs/telephonie/fournisseur/commande/commande.tableur.class.php b/htdocs/telephonie/fournisseur/commande/commande.tableur.class.php
index 363b8a67042..85bdc03bfbe 100644
--- a/htdocs/telephonie/fournisseur/commande/commande.tableur.class.php
+++ b/htdocs/telephonie/fournisseur/commande/commande.tableur.class.php
@@ -22,7 +22,7 @@
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/fournisseur/commande/methode.commande.class.php";
define ('COMMANDETABLEUR_NOEMAIL', -3);
diff --git a/htdocs/telephonie/fournisseur/commande/commande.text.class.php b/htdocs/telephonie/fournisseur/commande/commande.text.class.php
index d7432283e61..caf06202960 100644
--- a/htdocs/telephonie/fournisseur/commande/commande.text.class.php
+++ b/htdocs/telephonie/fournisseur/commande/commande.text.class.php
@@ -22,7 +22,7 @@
*
*
*/
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/fournisseur/commande/methode.commande.class.php";
define ('COMMANDETEXT_NOEMAIL', -3);
diff --git a/htdocs/telephonie/fournisseur/commande/commande.textp.class.php b/htdocs/telephonie/fournisseur/commande/commande.textp.class.php
index ba54e2cbc95..293867b9701 100644
--- a/htdocs/telephonie/fournisseur/commande/commande.textp.class.php
+++ b/htdocs/telephonie/fournisseur/commande/commande.textp.class.php
@@ -22,7 +22,7 @@
*
*
*/
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/fournisseur/commande/methode.commande.class.php";
define ('COMMANDETEXT_NOEMAIL', -3);
diff --git a/htdocs/telephonie/fournisseur/commande/commande.web.class.php b/htdocs/telephonie/fournisseur/commande/commande.web.class.php
index 85f05ce0868..2441a82b3dc 100644
--- a/htdocs/telephonie/fournisseur/commande/commande.web.class.php
+++ b/htdocs/telephonie/fournisseur/commande/commande.web.class.php
@@ -22,7 +22,7 @@
*
*
*/
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/fournisseur/commande/methode.commande.class.php";
define ('COMMANDETEXT_NOEMAIL', -3);
diff --git a/htdocs/telephonie/ligne/commande/commandetableur.class.php b/htdocs/telephonie/ligne/commande/commandetableur.class.php
index 92dda7bf2e5..847ca641466 100644
--- a/htdocs/telephonie/ligne/commande/commandetableur.class.php
+++ b/htdocs/telephonie/ligne/commande/commandetableur.class.php
@@ -22,7 +22,7 @@
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
define ('COMMANDETABLEUR_NOEMAIL', -3);
diff --git a/htdocs/telephonie/ligne/fiche.php b/htdocs/telephonie/ligne/fiche.php
index 5297fe49c58..e1795bc686f 100644
--- a/htdocs/telephonie/ligne/fiche.php
+++ b/htdocs/telephonie/ligne/fiche.php
@@ -21,7 +21,7 @@
*/
require "./pre.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
require_once DOL_DOCUMENT_ROOT.'/telephonie/telephonie.contrat.class.php';
$mesg = '';
diff --git a/htdocs/telephonie/script/api/presel-view.php b/htdocs/telephonie/script/api/presel-view.php
index e16db28fc14..b1cc0a9d1d3 100644
--- a/htdocs/telephonie/script/api/presel-view.php
+++ b/htdocs/telephonie/script/api/presel-view.php
@@ -23,7 +23,7 @@
*/
require ("../../../master.inc.php");
require_once DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
$host = CMD_PRESEL_WEB_HOST;
$user_login = CMD_PRESEL_WEB_USER;
diff --git a/htdocs/telephonie/script/commande_presel_statut.php b/htdocs/telephonie/script/commande_presel_statut.php
index 8dcf1f2717d..0b8cf4ab941 100644
--- a/htdocs/telephonie/script/commande_presel_statut.php
+++ b/htdocs/telephonie/script/commande_presel_statut.php
@@ -25,7 +25,7 @@
require ("../../master.inc.php");
_log($GLOBALS["argv"][0]." Start", LOG_NOTICE);
require_once DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php";
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
set_time_limit(0);
diff --git a/htdocs/telephonie/script/envoi-emails-speciaux.php b/htdocs/telephonie/script/envoi-emails-speciaux.php
index 61458476279..12a4748d555 100644
--- a/htdocs/telephonie/script/envoi-emails-speciaux.php
+++ b/htdocs/telephonie/script/envoi-emails-speciaux.php
@@ -36,7 +36,7 @@ require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
require_once (DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/pdfdetail_ibreizh.modules.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
dolibarr_syslog("Debut envoie de mail");
diff --git a/htdocs/telephonie/script/facturation-alerte.php b/htdocs/telephonie/script/facturation-alerte.php
index 12b7718f714..24aa43d97a1 100644
--- a/htdocs/telephonie/script/facturation-alerte.php
+++ b/htdocs/telephonie/script/facturation-alerte.php
@@ -40,7 +40,7 @@ $limit = $opt['l'];
$optcontrat = $opt['c'];
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/facturetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/telephonie.contrat.class.php");
diff --git a/htdocs/telephonie/script/facturation-emission.php b/htdocs/telephonie/script/facturation-emission.php
index 2c2b4cea97a..354a130f010 100644
--- a/htdocs/telephonie/script/facturation-emission.php
+++ b/htdocs/telephonie/script/facturation-emission.php
@@ -48,7 +48,7 @@ if (strlen($limit) == 0 && strlen($optcontrat) == 0)
require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/facturetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/telephonie.contrat.class.php");
diff --git a/htdocs/telephonie/script/facturation-impression.php b/htdocs/telephonie/script/facturation-impression.php
index 3e9314115f9..b400b4a4dd0 100644
--- a/htdocs/telephonie/script/facturation-impression.php
+++ b/htdocs/telephonie/script/facturation-impression.php
@@ -32,7 +32,7 @@ require ("../../master.inc.php");
require_once (DOL_DOCUMENT_ROOT."/facture.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
require_once (DOL_DOCUMENT_ROOT."/paiement.class.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/facturetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/telephonie.contrat.class.php");
diff --git a/htdocs/telephonie/script/presel_active_view.php b/htdocs/telephonie/script/presel_active_view.php
index ac9195ea5c0..eb1a2bd0842 100644
--- a/htdocs/telephonie/script/presel_active_view.php
+++ b/htdocs/telephonie/script/presel_active_view.php
@@ -23,7 +23,7 @@
*/
require ("../../master.inc.php");
require_once DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
$host = CMD_PRESEL_WEB_HOST;
$user_login = CMD_PRESEL_WEB_USER;
diff --git a/htdocs/telephonie/script/recap-commande-week.php b/htdocs/telephonie/script/recap-commande-week.php
index 91d46d2f369..38e21080fec 100644
--- a/htdocs/telephonie/script/recap-commande-week.php
+++ b/htdocs/telephonie/script/recap-commande-week.php
@@ -27,7 +27,7 @@ require "../../master.inc.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
define ('COMMANDETABLEUR_NOEMAIL', -3);
diff --git a/htdocs/telephonie/script/recap-commande.php b/htdocs/telephonie/script/recap-commande.php
index 92b7898af2d..1f589f270fa 100644
--- a/htdocs/telephonie/script/recap-commande.php
+++ b/htdocs/telephonie/script/recap-commande.php
@@ -27,7 +27,7 @@ require "../../master.inc.php";
require_once DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_workbook.inc.php";
require_once DOL_DOCUMENT_ROOT."/includes/php_writeexcel/class.writeexcel_worksheet.inc.php";
-require_once DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php";
define ('COMMANDETABLEUR_NOEMAIL', -3);
diff --git a/htdocs/telephonie/script/retour-traitement.php b/htdocs/telephonie/script/retour-traitement.php
index 61427434b1d..6307f1980e8 100644
--- a/htdocs/telephonie/script/retour-traitement.php
+++ b/htdocs/telephonie/script/retour-traitement.php
@@ -28,7 +28,7 @@ require_once (DOL_DOCUMENT_ROOT."/telephonie/facturetel.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/telephonie-tarif.class.php");
require_once (DOL_DOCUMENT_ROOT."/telephonie/communication.class.php");
require_once (DOL_DOCUMENT_ROOT."/societe.class.php");
-require_once (DOL_DOCUMENT_ROOT."/lib/dolibarrmail.class.php");
+require_once (DOL_DOCUMENT_ROOT."/telephonie/dolibarrmail.class.php");
if ($verbose) dolibarr_syslog("retour-traitement");
--
GitLab