diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
| commit | d1cae2da2abc3a602f682114bc02cce08a7e7578 (patch) | |
| tree | ef3147f9db85bdde8e26303971a40d86e10bb508 /mod/item.php | |
| parent | 33696cc8392daeb08d011aa3b1209f3b121898ea (diff) | |
| parent | b86253c655f974920c4d3de0915611a7e66c7336 (diff) | |
| download | volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2 volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index ed5941d2a..c504c77e1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -140,7 +140,9 @@ function item_post(&$a) { } } - if($parent) logger('mod_item: item_post parent=' . $parent); + if($parent) { + logger('mod_item: item_post parent=' . $parent); + } $observer = $a->get_observer(); @@ -320,6 +322,18 @@ function item_post(&$a) { $body = fix_mce_lf($body); } + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it. + + if((! $parent) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { + $x = q("select abook_id, abook_their_perms from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), + intval($profile_uid) + ); + if($x && ($x[0]['abook_their_perms'] & PERMS_W_TAGWALL)) + $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; + } + + /** * fix naked links by passing through a callback to see if this is a red site @@ -532,6 +546,7 @@ function item_post(&$a) { $datarray['item_restrict'] = $item_restrict; $datarray['item_flags'] = $item_flags; + $datarray['comment_policy'] = map_scope($channel['channel_w_comment']); // preview mode - prepare the body for display and send it via json |