adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-06 01:42:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace htmlentities by htmlspecialchars on NBM in order to send a correct UTF8 mail.

Browse Source 
Quote mail charset + add debug mail informations
Fix "check user with same mail" where null email was not discarded

git-svn-id: http://piwigo.org/svn/trunk@2136 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-10-12 22:14:23 +00:00
parent 4afa14cc8d
commit 608c174245
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/notification_by_mail.php
+1 -1
View File
@@ -247,7 +247,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l
{
// On HTML mail, detects if the content are HTML format.
// If it's plain text format, convert content to readable HTML
$customize_mail_content = nl2br(htmlentities($customize_mail_content));
$customize_mail_content = nl2br(htmlspecialchars($customize_mail_content));
}
// Prepare message after change language
include/functions_mail.inc.php
+3
View File
@@ -704,6 +704,9 @@ function pwg_mail($to, $args = array())
$filename .= '.html';
}
$file = fopen($filename, 'w+');
fwrite($file, $to);
fwrite($file, $cvt_subject);
fwrite($file, $headers);
fwrite($file, $content);
fclose($file);
return true;
plugins/c13y_upgrade/initialize.inc.php
+1
View File
@@ -43,6 +43,7 @@ function c13y_upgrade($c13y_array)
$query = '
select count(*)
from '.USERS_TABLE.'
where '.$conf['user_fields']['email'].' is not null
group by upper('.$conf['user_fields']['email'].')
having count(*) > 1
limit 0,1
template/yoga/mail/text/html/header.tpl
+1 -1
View File
@@ -1,5 +1,5 @@
-----={BOUNDARY_KEY}
Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
Content-Transfer-Encoding: 8bit
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
template/yoga/mail/text/plain/header.tpl
+1 -1
View File
@@ -1,3 +1,3 @@
-----={BOUNDARY_KEY}
Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
Content-Transfer-Encoding: 8bit