diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-16 07:13:14 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-16 07:13:14 +0100 |
| commit | 74c64ef2d244df47b2bea6527bbeb5cc62ca8845 (patch) | |
| tree | 1e3314f76eefd8f7d014ae8e4a218dc9663ae3d7 /include/delivery.php | |
| parent | 80b57e664a3df68994108a3d511468b249e0bbff (diff) | |
| parent | 47e1b8d0c07d79c33f8b2de52145aa751d4b955a (diff) | |
| download | volse-hubzilla-74c64ef2d244df47b2bea6527bbeb5cc62ca8845.tar.gz volse-hubzilla-74c64ef2d244df47b2bea6527bbeb5cc62ca8845.tar.bz2 volse-hubzilla-74c64ef2d244df47b2bea6527bbeb5cc62ca8845.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/delivery.php')
| -rwxr-xr-x | include/delivery.php | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/include/delivery.php b/include/delivery.php index c1ff07bd5..44a482ca2 100755 --- a/include/delivery.php +++ b/include/delivery.php @@ -435,8 +435,8 @@ function delivery_run($argv, $argc){ $headers .= 'Reply-to: ' . $reply_to . "\n"; // for testing purposes: Collect exported mails - $file = tempnam("/tmp/friendica/", "mail-out-"); - file_put_contents($file, json_encode($it)); + // $file = tempnam("/tmp/friendica/", "mail-out-"); + // file_put_contents($file, json_encode($it)); $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n"; @@ -446,30 +446,16 @@ function delivery_run($argv, $argc){ if($it['uri'] !== $it['parent-uri']) { $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n"; - if(! strlen($it['title'])) { + if(!strlen($it['title'])) { $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1", - dbesc($it['parent-uri']) - ); - if(count($r)) { - $subtitle = $r[0]['title']; - if($subtitle) { - if(strncasecmp($subtitle,'RE:',3)) - $subject = $subtitle; - else - $subject = 'Re: ' . $subtitle; - } - } + dbesc($it['parent-uri'])); + + if(count($r) AND ($r[0]['title'] != '')) + $subject = $r[0]['title']; } + if(strncasecmp($subject,'RE:',3)) + $subject = 'Re: '.$subject; } - /*$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"; - $html = prepare_body($it); - //$message = '<html><body>' . $html . '</body></html>'; - $message = html2plain($html); - logger('notifier: email delivery to ' . $addr); - mail($addr, $subject, $message, $headers);*/ email_send($addr, $subject, $headers, $it); } break; |