Mail: Subject are now with working "Re:"

[friendica.git] / include / delivery.php
diff --git a/include/delivery.php b/include/delivery.php

index c1ff07bd5438226b6b63a18e7327172e8329dff6..44a482ca28945368718d0c1be408a6f88df35ca4 100755 (executable)
--- 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;