keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

If we're going to encode the email headers, we probably should use the encoded version rather than the original

Browse source
This commit is contained in:
friendica 2013-01-03 03:47:08 -08:00
parent 9bb9350126
commit e394ccd0a8
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php'); require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1575' ); define ( 'FRIENDICA_VERSION', '3.1.1576' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'DB_UPDATE_VERSION', 1157 );

6
include/enotify.php
View file

@ -471,8 +471,8 @@ class enotify {
// generate a multipart/alternative message header // generate a multipart/alternative message header
$messageHeader = $messageHeader =
$params['additionalMailHeader'] . $params['additionalMailHeader'] .
"From: {$params['fromName']} <{$params['fromEmail']}>\n" . "From: $fromName <{$params['fromEmail']}>\n" .
"Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" . "Reply-To: $fromName <{$params['replyTo']}>\n" .
"MIME-Version: 1.0\n" . "MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
@ -493,7 +493,7 @@ class enotify {
// send the message // send the message
$res = mail( $res = mail(
$params['toEmail'], // send to address $params['toEmail'], // send to address
$params['messageSubject'], // subject $messageSubject, // subject
$multipartMessageBody, // message body $multipartMessageBody, // message body
$messageHeader // message headers $messageHeader // message headers
); );

1
include/socgraph.php
View file

@ -1,6 +1,7 @@
<?php <?php
require_once('include/datetime.php'); require_once('include/datetime.php');
require_once('include/zot.php');
/* /*

20
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.1.1575\n" "Project-Id-Version: 3.1.1576\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-01 10:00-0800\n" "POT-Creation-Date: 2013-01-02 10:00-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3240,38 +3240,38 @@ msgstr ""
msgid "Include your profile in member directory?" msgid "Include your profile in member directory?"
msgstr "" msgstr ""
#: ../../mod/register.php:256 #: ../../mod/register.php:255
msgid "Membership on this site is by invitation only." msgid "Membership on this site is by invitation only."
msgstr "" msgstr ""
#: ../../mod/register.php:257 #: ../../mod/register.php:256
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:260 ../../mod/admin.php:462 #: ../../mod/register.php:259 ../../mod/admin.php:462
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
#: ../../mod/register.php:268 #: ../../mod/register.php:267
msgid "Your Full Name (e.g. Joe Smith): " msgid "Your Full Name (e.g. Joe Smith): "
msgstr "" msgstr ""
#: ../../mod/register.php:269 #: ../../mod/register.php:268
msgid "Your Email Address: " msgid "Your Email Address: "
msgstr "" msgstr ""
#: ../../mod/register.php:270 #: ../../mod/register.php:269
msgid "" msgid ""
"Choose a profile nickname. This must begin with a text character. Your " "Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</" "profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'." "strong>'."
msgstr "" msgstr ""
#: ../../mod/register.php:271 #: ../../mod/register.php:270
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951 #: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:951
msgid "Register" msgid "Register"
msgstr "" msgstr ""