aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-02-24 08:50:42 +0100
committerMichael <icarus@dabo.de>2012-02-24 08:50:42 +0100
commit0ba45eb74543fc6377c48ac17d8b632e431e9467 (patch)
treee0006e486df5e02031fb0d61195f3674090970ae /include/notifier.php
parentf6320f3319a8009c7bdf51035b226f0ea688d8bd (diff)
downloadvolse-hubzilla-0ba45eb74543fc6377c48ac17d8b632e431e9467.tar.gz
volse-hubzilla-0ba45eb74543fc6377c48ac17d8b632e431e9467.tar.bz2
volse-hubzilla-0ba45eb74543fc6377c48ac17d8b632e431e9467.zip
Sending mail as multipart/alternative (html and plain text) (very basic by now)
Diffstat (limited to 'include/notifier.php')
-rwxr-xr-xinclude/notifier.php20
1 files changed, 6 insertions, 14 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 3ad433afd..b22e8c6f0 100755
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -651,10 +651,10 @@ function notifier_run($argv, $argc){
$file = tempnam("/tmp/friendica/", "mail-out2-");
file_put_contents($file, json_encode($it));
- $headers .= 'Message-Id: <' . cleanupmessageid($it['uri']) . '>' . "\n";
+ $headers .= 'Message-Id: <' . email_cleanupmessageid($it['uri']) . '>' . "\n";
if($it['uri'] !== $it['parent-uri']) {
- $headers .= 'References: <' . cleanupmessageid($it['parent-uri']) . '>' . "\n";
+ $headers .= 'References: <' . email_cleanupmessageid($it['parent-uri']) . '>' . "\n";
if(! strlen($it['title'])) {
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
dbesc($it['parent-uri'])
@@ -671,7 +671,7 @@ function notifier_run($argv, $argc){
}
}
- $headers .= 'MIME-Version: 1.0' . "\n";
+ /*$headers .= 'MIME-Version: 1.0' . "\n";
//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
@@ -679,7 +679,8 @@ function notifier_run($argv, $argc){
//$message = '<html><body>' . $html . '</body></html>';
$message = html2plain($html);
logger('notifier: email delivery to ' . $addr);
- mail($addr, $subject, $message, $headers);
+ mail($addr, $subject, $message, $headers);*/
+ email_send($addr, $subject, $headers, $it);
}
break;
case NETWORK_DIASPORA:
@@ -726,7 +727,7 @@ function notifier_run($argv, $argc){
// we are the relay - send comments, likes and unlikes to our conversants
diaspora_send_relay($target_item,$owner,$contact);
break;
- }
+ }
elseif(($top_level) && (! $walltowall)) {
// currently no workable solution for sending walltowall
diaspora_send_status($target_item,$owner,$contact);
@@ -841,15 +842,6 @@ function notifier_run($argv, $argc){
return;
}
-function cleanupmessageid($messageid) {
- global $a;
-
- if (!strpos($messageid, '@'))
- $messageid = str_replace(":", ".", $messageid).'@'.$a->get_hostname();
-
- return($messageid);
-}
-
if (array_search(__file__,get_included_files())===0){
notifier_run($argv,$argc);
killme();