Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-07-18 00:55:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46 from fevrier/fix_email_encoding

Browse source 
Fix email encoding
This commit is contained in:
pyg77 2013-02-27 05:42:50 -08:00
commit 9ac3da3c03
5 changed files with 61 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

39
adminstuds.php
View file

@ -103,13 +103,6 @@ $dsondage=$sondage->FetchObject(false);
//si la valeur du nouveau titre est valide et que le bouton est activé
$adresseadmin = $dsondage->mail_admin;
$headers_str = <<<EOF
From: %s <%s>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
EOF;
$headers = sprintf($headers_str, NOMAPPLICATION, ADRESSEMAILADMIN);
if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])) {
if(issetAndNoEmpty('nouveautitre') === false) {
@ -122,12 +115,11 @@ if (isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"])
//envoi du mail pour prevenir l'admin de sondage
if ($connect->Execute($sql, array($nouveautitre, $numsondage))) {
mail ($adresseadmin,
sendEmail( $adresseadmin,
_("[ADMINISTRATOR] New title for your poll") . ' ' . NOMAPPLICATION,
_("You have changed the title of your poll. \nYou can modify this poll with this link") .
" :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" .
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION,
$headers);
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION );
}
}
}
@ -145,12 +137,11 @@ if (isset($_POST["boutonnouveauxcommentaires"]) || isset($_POST["boutonnouveauxc
if ($connect->Execute($sql, array($commentaires, $numsondage))) {
//envoi du mail pour prevenir l'admin de sondage
mail ($adresseadmin,
sendEmail( $adresseadmin,
_("[ADMINISTRATOR] New comments for your poll") . ' ' . NOMAPPLICATION,
_("You have changed the comments of your poll. \nYou can modify this poll with this link") .
" :\n\n".getUrlSondage($numsondageadmin, true)." \n\n" .
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION,
$headers);
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION );
}
}
}
@ -168,12 +159,11 @@ if (isset($_POST["boutonnouvelleadresse"]) || isset($_POST["boutonnouvelleadress
if ($connect->Execute($sql, array($nouvelleadresse, $numsondage))) {
//envoi du mail pour prevenir l'admin de sondage
mail ($_POST['nouvelleadresse'],
sendEmail( $_POST['nouvelleadresse'],
_("[ADMINISTRATOR] New email address for your poll") . ' ' . NOMAPPLICATION,
_("You have changed your email address in your poll. \nYou can modify this poll with this link") .
" :\n\n".getUrlSondage($numsondageadmin, true)."\n\n" .
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION,
$headers);
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION );
}
}
}
@ -318,12 +308,11 @@ if (isset($_POST["confirmesuppression"]) || isset($_POST["confirmesuppression_x"
error_log($date . " SUPPRESSION: $dsondage->id_sondage\t$dsondage->format\t$dsondage->nom_admin\t$dsondage->mail_admin\n", 3, 'admin/logs_studs.txt');
//envoi du mail a l'administrateur du sondage
mail ($adresseadmin,
sendEmail( $adresseadmin,
_("[ADMINISTRATOR] Removing of your poll") . ' ' . NOMAPPLICATION,
_("You have removed your poll. \nYou can make new polls with this link") .
" :\n\n".get_server_name()."index.php \n\n" .
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION,
$headers);
_("Thanks for your confidence.") . "\n" . NOMAPPLICATION );
//affichage de l'ecran de confirmation de suppression de sondage
print_header();
@ -466,11 +455,10 @@ if (isset($_POST["ajoutercolonne_x"]) && issetAndNoEmpty('nouvellecolonne') && (
$sql = $connect->Prepare($sql);
if ($connect->Execute($sql, array($nouveauxsujets, $numsondage))) {
//envoi d'un mail pour prévenir l'administrateur du changement
$headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit";
mail ("$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" .
sendEmail( "$adresseadmin", "" . _("[ADMINISTRATOR] New column for your poll").NOMAPPLICATION, "" .
_("You have added a new column in your poll. \nYou can inform the voters of this change with this link") .
" : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,
$headers);
" : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION );
}
}
@ -581,11 +569,10 @@ if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage-
//envoi d'un mail pour prévenir l'administrateur du changement
$adresseadmin = $dsondage->mail_admin;
mail ($adresseadmin,
sendEmail( $adresseadmin,
_("[ADMINISTRATOR] New column for your poll"),
_("You have added a new column in your poll. \nYou can inform the voters of this change with this link").
" : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,
$headers);
" : \n\n".getUrlSondage($numsondage)." \n\n " . _("Thanks for your confidence.") . "\n".NOMAPPLICATION );
} else {
$erreur_ajout_date="yes";
}