scale external images

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
old mode 100644 (file)
new mode 100755 (executable)
index 1db1b09..8ec6252
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -35,7 +35,7 @@ function notifier_run($argv, $argc){
        require_once("datetime.php");
        require_once('include/items.php');
        require_once('include/bbcode.php');
-
+       require_once('include/email.php');
        load_config('config');
        load_config('system');
 
@@ -111,7 +111,7 @@ function notifier_run($argv, $argc){
        else {
 
                // find ancestors
-               $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
                        intval($item_id)
                );
 
@@ -128,7 +128,7 @@ function notifier_run($argv, $argc){
                        return;
 
                $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
-                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
+                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
                        intval($parent_id)
                );
 
@@ -264,7 +264,7 @@ function notifier_run($argv, $argc){
                        $deny_people  = expand_acl($parent['deny_cid']);
                        $deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
-                       // if our parent is a forum, uplink to the origonal author causing
+                       // if our parent is a forum, uplink to the origional author causing
                        // a delivery fork
 
                        if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
@@ -382,8 +382,8 @@ function notifier_run($argv, $argc){
                                        continue;
                                if($item['id'] == $item_id) {
                                        logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
-                                       $slap  = atom_entry($item,'html',$owner,$owner,false);
-                                       $atom .= atom_entry($item,'text',$owner,$owner,false);
+                                       $slap  = atom_entry($item,'html',null,$owner,false);
+                                       $atom .= atom_entry($item,'text',null,$owner,false);
                                }
                        }
                }
@@ -410,13 +410,13 @@ function notifier_run($argv, $argc){
                                        // older sites without a corresponding dfrn_notify change may do the wrong thing.
 
                                    if($item_id == $item['id'] || $item['id'] == $item['parent'])
-                                               $atom .= atom_entry($item,'text',$contact,$owner,true);
+                                               $atom .= atom_entry($item,'text',null,$owner,true);
                                }
                                else
-                                       $atom .= atom_entry($item,'text',$contact,$owner,true);
+                                       $atom .= atom_entry($item,'text',null,$owner,true);
 
                                if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-                                       $slaps[] = atom_entry($item,'html',$contact,$owner,true);
+                                       $slaps[] = atom_entry($item,'html',null,$owner,true);
                        }
                }
        }
@@ -526,6 +526,14 @@ function notifier_run($argv, $argc){
                                                );
 
                                                if(count($x)) {
+
+                                                       if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+                                                               q("update contact set writable = 1 where id = %d limit 1",
+                                                                       intval($x[0]['id'])
+                                                               );
+                                                               $x[0]['writable'] = 1;
+                                                       }
+
                                                        require_once('library/simplepie/simplepie.inc');
                                                        logger('mod-delivery: local delivery');
                                                        local_delivery($x[0],$atom);
@@ -584,6 +592,7 @@ function notifier_run($argv, $argc){
                                        break;
 
                                case NETWORK_MAIL:
+                               case NETWORK_MAIL2:
                                                
                                        if(get_config('system','dfrn_only'))
                                                break;
@@ -625,14 +634,14 @@ function notifier_run($argv, $argc){
                                                if($r1 && $r1[0]['reply_to'])
                                                        $reply_to = $r1[0]['reply_to'];
        
-                                               $subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
+                                               $subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
 
                                                // only expose our real email address to true friends
 
-                                               if($contact['rel'] == CONTACT_IS_FRIEND)
-                                                       $headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+                                               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
-                                                       $headers  = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+                                                       $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";
@@ -754,9 +763,10 @@ function notifier_run($argv, $argc){
                );
                        
                $r2 = q("SELECT `id`, `name`,`network` FROM `contact` 
-                       WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
+                       WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
                        AND `rel` != %d order by rand() ",
                        dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_MAIL2),
                        intval($owner['uid']),
                        intval(CONTACT_IS_SHARING)
                );