Changeset 2136

Timestamp:

Oct 13, 2007, 12:14:23 AM (17 years ago)

Author:

rub

Message:

Replace htmlentities by htmlspecialchars on NBM in order to send a correct UTF8 mail.
Quote mail charset + add debug mail informations
Fix "check user with same mail" where null email was not discarded

Location:

trunk

Files:

• admin/notification_by_mail.php (modified) (1 diff)
• include/functions_mail.inc.php (modified) (1 diff)
• plugins/c13y_upgrade/initialize.inc.php (modified) (1 diff)
• template/yoga/mail/text/html/header.tpl (modified) (1 diff)
• template/yoga/mail/text/plain/header.tpl (modified) (1 diff)

trunk/admin/notification_by_mail.php

@@ -248 +248 @@
           // 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));
         }
 

trunk/include/functions_mail.inc.php

@@ -705 +705 @@
     }
     $file = fopen($filename, 'w+');
+    fwrite($file, $to);
+    fwrite($file, $cvt_subject);
+    fwrite($file, $headers);
     fwrite($file, $content);
     fclose($file);

trunk/plugins/c13y_upgrade/initialize.inc.php

@@ -44 +44 @@
 select count(*)
 from '.USERS_TABLE.'
+where '.$conf['user_fields']['email'].' is not null
 group by upper('.$conf['user_fields']['email'].')
 having count(*) > 1

trunk/template/yoga/mail/text/html/header.tpl

@@ -1 +1 @@
 -----={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
 Content-Transfer-Encoding: 8bit
 

trunk/template/yoga/mail/text/plain/header.tpl

@@ -1 +1 @@
 -----={BOUNDARY_KEY}
-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Type: {CONTENT_TYPE}; charset="{CONTENT_ENCODING}";
 Content-Transfer-Encoding: 8bit