Merge pull request #803 from annando/master

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 1328771a6789bb3e623459e95e70ec76fd009c50..1de45255e9497ae3186525aeca9600932a7212e4 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -3,7 +3,7 @@ require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
 
-function delivery_run($argv, $argc){
+function delivery_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)){
@@ -12,13 +12,13 @@ function delivery_run($argv, $argc){
 
        if(is_null($db)) {
                @include(".htconfig.php");
-               require_once("dba.php");
+               require_once("include/dba.php");
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
                        unset($db_host, $db_user, $db_pass, $db_data);
        }
 
-       require_once("session.php");
-       require_once("datetime.php");
+       require_once("include/session.php");
+       require_once("include/datetime.php");
        require_once('include/items.php');
        require_once('include/bbcode.php');
        require_once('include/diaspora.php');
@@ -52,7 +52,7 @@ function delivery_run($argv, $argc){
                );
                if(! count($r)) {
                        continue;
-               }       
+               }
 
                $maxsysload = intval(get_config('system','maxloadavg'));
                if($maxsysload < 1)
@@ -67,7 +67,7 @@ function delivery_run($argv, $argc){
 
                // It's ours to deliver. Remove it from the queue.
 
-               q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+               q("delete from deliverq where cmd = '%s' and item = %d and contact = %d",
                        dbesc($cmd),
                        dbesc($item_id),
                        dbesc($contact_id)
@@ -323,14 +323,15 @@ function delivery_run($argv, $argc){
                                                WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                                AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
                                                $sql_extra
-                                               AND `user`.`account_expired` = 0 LIMIT 1",
+                                               AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1",
                                                dbesc(NETWORK_DFRN),
                                                dbesc($nickname)
                                        );
 
-                                       if(count($x)) {
-                                               if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
-                                                       q("update contact set writable = 1 where id = %d limit 1",
+                                       if($x && count($x)) {
+                                               $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
+                                               if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) {
+                                                       q("update contact set writable = 1 where id = %d",
                                                                intval($x[0]['id'])
                                                        );
                                                        $x[0]['writable'] = 1;
@@ -429,7 +430,7 @@ function delivery_run($argv, $argc){
                                        if($cmd === 'wall-new') 
                                                $it = $items[0];
                                        else {
-                                               $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
+                                               $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                                        intval($argv[2]),
                                                        intval($uid)
                                                );
@@ -438,14 +439,14 @@ function delivery_run($argv, $argc){
                                        }
                                        if(! $it)
                                                break;
-                                       
+
 
                                        $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                                                intval($uid)
                                        );
                                        if(! count($local_user))
                                                break;
-                                       
+
                                        $reply_to = '';
                                        $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                                intval($uid)
@@ -457,13 +458,17 @@ function delivery_run($argv, $argc){
 
                                        // only expose our real email address to true friends
 
-                                       if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
-                                               $headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
-                                       else
+                                       if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked'])) {
+                                               if($reply_to) {
+                                                       $headers  = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n";
+                                                       $headers .= 'Sender: '.$local_user[0]['email']."\n";
+                                               } else
+                                                       $headers  = 'From: '.email_header_encode($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
+                                       } else
                                                $headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
 
-                                       if($reply_to)
-                                               $headers .= 'Reply-to: ' . $reply_to . "\n";
+                                       //if($reply_to)
+                                       //      $headers .= 'Reply-to: ' . $reply_to . "\n";
 
                                        // for testing purposes: Collect exported mails
                                        // $file = tempnam("/tmp/friendica/", "mail-out-");
@@ -476,13 +481,28 @@ function delivery_run($argv, $argc){
                                        //logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
 
                                        if($it['uri'] !== $it['parent-uri']) {
-                                               $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
-                                               if(!strlen($it['title'])) {
-                                                       $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
-                                                               dbesc($it['parent-uri']));
+                                               $headers .= "References: <".iri2msgid($it["parent-uri"]).">";
+
+                                               // If Threading is enabled, write down the correct parent
+                                               if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"]))
+                                                       $headers .= " <".iri2msgid($it["thr-parent"]).">";
+                                               $headers .= "\n";
+
+                                               if(!$it['title']) {
+                                                       $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                               dbesc($it['parent-uri']),
+                                                               intval($uid));
 
                                                        if(count($r) AND ($r[0]['title'] != ''))
                                                                $subject = $r[0]['title'];
+                                                       else {
+                                                               $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
+                                                                       dbesc($it['parent-uri']),
+                                                                       intval($uid));
+
+                                                               if(count($r) AND ($r[0]['title'] != ''))
+                                                                       $subject = $r[0]['title'];
+                                                       }
                                                }
                                                if(strncasecmp($subject,'RE:',3))
                                                        $subject = 'Re: '.$subject;
@@ -522,7 +542,7 @@ function delivery_run($argv, $argc){
 
                                        diaspora_send_relay($target_item,$owner,$contact,$public_message);
                                        break;
-                               }               
+                               }
                                elseif(($top_level) && (! $walltowall)) {
                                        // currently no workable solution for sending walltowall
                                        logger('delivery: diaspora status: ' . $loc);
@@ -538,6 +558,9 @@ function delivery_run($argv, $argc){
                        case NETWORK_FACEBOOK :
                                if(get_config('system','dfrn_only'))
                                        break;
+                       case NETWORK_PUMPIO :
+                               if(get_config('system','dfrn_only'))
+                                       break;
                        default:
                                break;
                }