Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1722 → Rev 1723

/branches/v1.2-lithium/scripts/bibliotheque/Messagerie.php
7,9 → 7,11
$this->conteneur = $conteneur;
}
 
public function envoyerHtml($destinataires, $sujet, $message) {
$messageHtml = $message;
$messageTxt = $this->supprimerHtml($message);
public function envoyerHtml($destinataires, $sujet, $messageHtml, $messageTxt = '') {
if ($messageTxt == '') {
$messageSansHtml = $this->supprimerHtml($messageHtml);
$messageTxt = $this->nettoyerTxt($messageSansHtml);
}
$emailExpediteur = $this->conteneur->getParametre('adresse_expediteur_recapitulatif');
$encodage = $this->conteneur->getParametre('encodage_appli');
$dateHeure = date('D, j M Y G:i:s O');
44,8 → 46,7
return $envoieStatut;
}
 
public function envoyerTxt($destinataires, $sujet, $message) {
$messageTxt = $this->supprimerHtml($message);
public function envoyerTxt($destinataires, $sujet, $messageTxt) {
$emailExpediteur = $this->conteneur->getParametre('adresse_expediteur_recapitulatif');
$dateHeure = date('D, j M Y G:i:s O');
 
84,9 → 85,7
private function supprimerHtml($messageHtml) {
$html = $this->ajouterHrefDansBalise($messageHtml);
$messageSansHtml = strip_tags($html);
$messageSansTab = preg_replace('/^\t+/', '', $messageSansHtml);
$messageTxt = html_entity_decode($messageSansTab, null, 'UTF-8');
return $messageTxt;
return $messageSansHtml;
}
 
/**
106,4 → 105,11
$html = $dom->saveHtml();
return $html;
}
 
private function nettoyerTxt($message) {
$messageSansTab = preg_replace('/\t+/', '', $message);
$messageSansRetourMultiple = preg_replace('/\n+/', "\n", $messageSansTab);
$messageTxt = html_entity_decode($messageSansRetourMultiple, null, 'UTF-8');
return $messageTxt;
}
}