get rid of 'Friendika'

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index f0a1940d498cffd17cc426ddc41f64ebe7d6f535..171b55fc37425f0fa513be5266cbfeab0933c7ad 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -18,6 +18,31 @@ require_once('include/html2plain.php');
  * us by hosting providers. 
  */
 
+/*
+ * The notifier is typically called with:
+ *
+ *             proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
+ *
+ * where COMMAND is one of the following:
+ *
+ *             activity                                (in diaspora.php, dfrn_confirm.php, profiles.php)
+ *             comment-import                  (in diaspora.php, items.php)
+ *             comment-new                             (in item.php)
+ *             drop                                    (in diaspora.php, items.php, photos.php)
+ *             edit_post                               (in item.php)
+ *             event                                   (in events.php)
+ *             expire                                  (in items.php)
+ *             like                                    (in like.php, poke.php)
+ *             mail                                    (in message.php)
+ *             suggest                                 (in fsuggest.php)
+ *             tag                                             (in photos.php, poke.php, tagger.php)
+ *             tgroup                                  (in items.php)
+ *             wall-new                                (in photos.php, item.php)
+ *
+ * and ITEM_ID is the id of the item in the database that needs to be sent to others.
+ */
+
+
 function notifier_run($argv, $argc){
        global $a, $db;
 
@@ -125,7 +150,7 @@ function notifier_run($argv, $argc){
                $uid = $r[0]['uid'];
                $updated = $r[0]['edited'];
 
-               // The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
+               // POSSIBLE CLEANUP --> The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
                if(! $parent_id)
                        return;
 
@@ -270,7 +295,7 @@ function notifier_run($argv, $argc){
                        // a delivery fork. private groups (forum_mode == 2) do not uplink
 
                        if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
-                               proc_run('php','include/notifier','uplink',$item_id);
+                               proc_run('php','include/notifier.php','uplink',$item_id);
                        }
 
                        $conversants = array();
@@ -399,7 +424,7 @@ function notifier_run($argv, $argc){
 
                                // private emails may be in included in public conversations. Filter them.
 
-                               if(($public_message) && $item['private'])
+                               if(($public_message) && $item['private'] == 1)
                                        continue;
 
 
@@ -555,9 +580,9 @@ function notifier_run($argv, $argc){
                                                        dbesc($nickname)
                                                );
 
-                                               if(count($x)) {
-
-                                                       if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+                                               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 limit 1",
                                                                        intval($x[0]['id'])
                                                                );