Suppression conflit avec PEAR-Mail

This commit is contained in:
Michael RICOIS 2011-01-25 09:45:02 +00:00
parent 4b41ca7b11
commit eac2dbff93
18 changed files with 18 additions and 18 deletions

View File

@ -119,7 +119,7 @@ $emailTxt.= listeCmd(1);
$emailtTxt = utf8_encode($emailTxt);
//Envoi mail
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
$sujet = "[COMMANDES PIECES COURRIER] - ".date('d')."/".date('m')."/".date('Y');
$from = array(
'email' => 'production@scores-decisions.com',

View File

@ -21,7 +21,7 @@ Utilisation :
require_once '../config/prepend.php';
//Inclure la base de données
require_once 'dbbootstrap.php';
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
function listCmdMois($statut, $date){
setDbConn('sdv1');

View File

@ -4,7 +4,7 @@
// -------------------------------------------------------------------------- //
function envoieCourriel($sujet, $texte)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail("[Giant] ".$sujet , $texte,
// From
array('email' => CONF_MEL_FROM,

View File

@ -60,7 +60,7 @@ function graydon_messageSoapFault()
*/
function graydon_mailSoapFault($message)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
"Erreur SOAP - (Date :".date("d")."/".date("m")."/".date("Y").")",
$message,

View File

@ -616,7 +616,7 @@ function getIdentite($identifier, $CompanyProductIdentifier)
// -------------------------------------------------------------------------- //
function envoieCourriel($ref)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail("[International] - (Date :".
date("d")."/".date("m")."/".date("Y").") - Commande",
"Commande effectuée par ".$_SESSION['tabInfo']['login']."\n".

View File

@ -341,7 +341,7 @@ function lien_factice($siret, $ref, $lib)
function sendCmdMail($sujet, $message)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
$sujet, $message,
//From

View File

@ -347,7 +347,7 @@ function mailCommande($email, $siren, $type){
$subject = "Commande de pièces pour $siren à ".$email;
break;
}
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
$subject,
'REQUEST='.EOL.print_r($_REQUEST,true).'EOL'.

View File

@ -2,7 +2,7 @@
require_once realpath(dirname(__FILE__)).'/functions.php';
require_once realpath(dirname(__FILE__)).'/constantes.php';
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
/** INFOGREFFE **/
define('INFOGREFFE_FILETIME', 8);

View File

@ -11,7 +11,7 @@ $siren = substr($siret,0,9);
if ($start > 0 && $start < 3) {
$url = getKbis($siren);
if ($url === false) {
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail("Commande de KBIS pour $login ($siren) : Erreur",
'REQUEST='.EOL.print_r($_REQUEST, true).EOL.
'SERVER='.EOL.print_r($_SERVER, true).EOL.

View File

@ -106,7 +106,7 @@ if ($_REQUEST['action']<>'envoyer')
$fp=fopen(PATH_LOGS.'enquetes.csv', 'a');
fwrite($fp, date('Y/m/d H:i:s').' - '.print_r($_REQUEST['formR'],true).print_r($tabInfo,true)."\n");
fclose($fp);
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
"Demande d'investigation",
print_r($_REQUEST['formR'],true).print_r($tabInfo,true),

View File

@ -76,7 +76,7 @@ function messageSoapFault()
*/
function mailSoapFault($message)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
"Erreur SOAP - ".EXTRANET_URL." - (Date :".date("d")."/".date("m")."/".date("Y").")",
$message,

View File

@ -82,7 +82,7 @@ function avis_erreurmsg(){
function avis_mailerreur()
{
// Envoi mail erreur
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail(
'AVIS INSEE - (Date :'.date('d').'/'.date('m').'/'.date('Y').')',
'Accès impossible au site de situation INSEE : '.

View File

@ -92,7 +92,7 @@ if (isset($_POST['submit'])) {
$message .= '</font>';
} else {
$commande_id = setEnquete($pays);
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail("DEBUG - Commandes de rapport graydon",
"Commandes\n".
"Utilisateur :\n".print_r($_POST['InfoUser'], true)."\n".

View File

@ -66,7 +66,7 @@ if (isset($company)) {
$product->Type == 'Database' &&
$product->Level == 3) {
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail('Rapport International',
"ImmediateWithUpdate disponible\n" .
"Identifiant : ".$identifier,
@ -111,7 +111,7 @@ if (isset($company)) {
$mimetype = true;
break;
} else {
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail('Rapport International',
'Rapport international disponible dans un autre'.
" format que le XML\n" .

View File

@ -98,7 +98,7 @@ function infogreffeProduits($siren, $type)
// -------------------------------------------------------------------------- //
function sendCmdMail($sujet, $message)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail($sujet,
$message,
// From

View File

@ -8,7 +8,7 @@ if (!page_checkParams()) {
function sendCmdMail($sujet, $message)
{
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail($sujet,
$message,
// From

View File

@ -228,7 +228,7 @@ if ($action != 'commande') {
if (preg_match('#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#', $_REQUEST['email'])) {
$message = 'Entreprise mise sous surveillance scoring partenaire !';
require_once 'mail/mail.php';
require_once 'sendmail/mail.php';
sendMail("Demande de surveillance score CreditSafe pour $siren à ".
$_REQUEST['email'],
'REQUEST='.EOL.print_r($_REQUEST, true).'EOL'.