notifications refactor

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index caf4973457a7a22e83c46428ee40bb5caffbc743..278a9242e430e97d5be3e063b31f3cc5e36a22f8 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -143,7 +143,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
        $salmon = feed_salmonlinks($owner_nick);
 
        $atom .= replace_macros($feed_template, array(
-               '$version'      => xmlify(FRIENDIKA_VERSION),
+               '$version'      => xmlify(FRIENDICA_VERSION),
                '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
                '$feed_title'   => xmlify($owner['name']),
                '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
@@ -927,10 +927,7 @@ function tgroup_deliver($uid,$item_id) {
        if(! count($u))
                return;
 
-       // We will only forward public tgroup posts, as this opens a second delivery chain
-       // and privacy can only be controlled by the first chain.
-
-       $i = q("select * from item where id = %d and uid = %d and private = 0 limit 1",
+       $i = q("select * from item where id = %d and uid = %d limit 1",
                intval($item_id),
                intval($uid)
        );
@@ -961,7 +958,7 @@ function tgroup_deliver($uid,$item_id) {
        if(! $deliver_to_tgroup)
                return;
 
-       // now change this post to a forum head message and deliver to all the tgroup members
+       // now change this copy of the post to a forum head message and deliver to all the tgroup members
 
 
        q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1",
@@ -1827,6 +1824,21 @@ function local_delivery($importer,$data) {
 
                // send email notification if requested.
 
+               $notif_params = array(
+                       'type' => NOTIFY_MAIL,
+                       'notify_flags' => $importer['notify_flags'],
+                       'language' => $importer['language'],
+                       'to_name' => $importer['username'],
+                       'to_email' => $importer['email'],
+                       'title' => $msg['title'],
+                       'body' => $msg['body'],
+                       'source_name' => $msg['from-name'],
+                       'source_link' => $importer['url'],
+                       'source_photo' => $importer['thumb'],
+               );
+                       
+               //notification($notif_params);
+
                require_once('bbcode.php');
                if($importer['notify-flags'] & NOTIFY_MAIL) {
 
@@ -1927,7 +1939,7 @@ function local_delivery($importer,$data) {
                        if($deleted) {
 
                                $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
-                                       WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+                                       WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
                                        intval($importer['importer_uid']),
                                        intval($importer['id'])
@@ -2043,7 +2055,7 @@ function local_delivery($importer,$data) {
  
                        // was the top-level post for this reply written by somebody on this site? 
                        // Specifically, the recipient? 
-//dbg(1);
+
                        $r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, 
                                `contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
                                LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
@@ -2055,7 +2067,7 @@ function local_delivery($importer,$data) {
                                dbesc($parent_uri),
                                intval($importer['importer_uid'])
                        );
-//dbg(0);
+
                        if($r && count($r)) {   
 
                                logger('local_delivery: received remote comment');
@@ -2063,6 +2075,9 @@ function local_delivery($importer,$data) {
                                // remote reply to our post. Import and then notify everybody else.
                                $datarray = get_atom_elements($feed,$item);
 
+
+               // TODO: make this next part work against both delivery threads of a community post
+
 //                             if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
 //                                     logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] ); 
                                        // they won't know what to do so don't report an error. Just quietly die.
@@ -2814,14 +2829,32 @@ function item_expire($uid,$days) {
 
        if(! count($r))
                return;
+
+       $expire_items = get_pconfig($uid, 'expire','items');
+       $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
+       
+       $expire_notes = get_pconfig($uid, 'expire','notes');
+       $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
+
+       $expire_starred = get_pconfig($uid, 'expire','starred');
+       $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
+       
+       $expire_photos = get_pconfig($uid, 'expire','photos');
+       $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
  
-       logger('expire: # items=' . count($r) );
+       logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 
        foreach($r as $item) {
 
                // Only expire posts, not photos and photo comments
 
-               if(strlen($item['resource-id']))
+               if($expire_photos==0 && strlen($item['resource-id']))
+                       continue;
+               if($expire_starred==0 && intval($item['starred']))
+                       continue;
+               if($expire_notes==0 && $item['type']=='note')
+                       continue;
+               if($expire_items==0 && $item['type']!='note')
                        continue;
 
                $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
@@ -2842,7 +2875,7 @@ function item_expire($uid,$days) {
        }
 
        proc_run('php',"include/notifier.php","expire","$uid");
-
+       
 }