rev update

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
old mode 100755 (executable)
new mode 100644 (file)
index 98c4f75..5f84a54
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -51,6 +51,17 @@ function delivery_run($argv, $argc){
                return;
        }       
 
+       $maxsysload = intval(get_config('system','maxloadavg'));
+       if($maxsysload < 1)
+               $maxsysload = 50;
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+               if(intval($load[0]) > $maxsysload) {
+                       logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
+                       return;
+               }
+       }
+
        // 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",
@@ -256,7 +267,8 @@ function delivery_run($argv, $argc){
                                        '$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
                                        '$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
                                        '$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-                                       '$birthday'     => $birthday
+                                       '$birthday'     => $birthday,
+                                       '$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
                        ));
 
                        foreach($items as $item) {
@@ -273,10 +285,10 @@ function delivery_run($argv, $argc){
 
                                if($normal_mode) {
                                        if($item_id == $item['id'] || $item['id'] == $item['parent'])
-                                               $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+                                               $atom .= atom_entry($item,'text',null,$owner,true);
                                }
                                else
-                                       $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+                                       $atom .= atom_entry($item,'text',null,$owner,true);
 
                        }
 
@@ -320,6 +332,14 @@ function delivery_run($argv, $argc){
                                                $x[0]['writable'] = 1;
                                        }
 
+                                       $ssl_policy = get_config('system','ssl_policy');
+                                       fix_contact_ssl_policy($x[0],$ssl_policy);
+
+                                       // If we are setup as a soapbox we aren't accepting input from this person
+
+                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                               break;
+
                                        require_once('library/simplepie/simplepie.inc');
                                        logger('mod-delivery: local delivery');
                                        local_delivery($x[0],$atom);
@@ -327,7 +347,10 @@ function delivery_run($argv, $argc){
                                }
                        }
 
-                       $deliver_status = dfrn_deliver($owner,$contact,$atom);
+                       if(! was_recently_delayed($contact['id']))
+                               $deliver_status = dfrn_deliver($owner,$contact,$atom);
+                       else
+                               $deliver_status = (-1);
 
                        logger('notifier: dfrn_delivery returns ' . $deliver_status);
 
@@ -364,13 +387,17 @@ function delivery_run($argv, $argc){
                                                continue;
 
                                        if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-                                               $slaps[] = atom_entry($item,'html',$item_contact,$owner,true);
+                                               $slaps[] = atom_entry($item,'html',null,$owner,true);
                                }
 
                                logger('notifier: slapdelivery: ' . $contact['name']);
                                foreach($slaps as $slappy) {
                                        if($contact['notify']) {
-                                               $deliver_status = slapper($owner,$contact['notify'],$slappy);
+                                               if(! was_recently_delayed($contact['id']))
+                                                       $deliver_status = slapper($owner,$contact['notify'],$slappy);
+                                               else
+                                                       $deliver_status = (-1);
+
                                                if($deliver_status == (-1)) {
                                                        // queue message for redelivery
                                                        add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
@@ -435,41 +462,27 @@ 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: <' . email_cleanupmessageid($it['uri']). '>' . "\n";
+                               $headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
 
                                //logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
                                //logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
                                //logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
 
                                if($it['uri'] !== $it['parent-uri']) {
-                                       $headers .= 'References: <' . email_cleanupmessageid($it['parent-uri']) . '>' . "\n";
-                                       if(! strlen($it['title'])) {
+                                       $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'])
-                                               );
-                                               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;