create third privacy state - public post but not searchable or publicly visible

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index df242d6f7c5390f6cb2c64b7dfc75e9dc2e27378..554e97fe46a0d595b2df122a3c32b5c3f4830865 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -108,7 +108,7 @@ function item_post(&$a) {
                }
        }
 
-       if($parent) logger('mod_post: parent=' . $parent);
+       if($parent) logger('mod_item: item_post parent=' . $parent);
 
        $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
        $post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])     : 0);
@@ -228,7 +228,7 @@ function item_post(&$a) {
                                || strlen($parent_item['allow_gid']) 
                                || strlen($parent_item['deny_cid']) 
                                || strlen($parent_item['deny_gid'])) {
-                               $private = 1;
+                               $private = (($parent_item['private']) ? $parent_item['private'] : 1);
                        }
 
                        $str_contact_allow = $parent_item['allow_cid'];
@@ -262,17 +262,17 @@ function item_post(&$a) {
                }
        }
 
-        if(strlen($categories)) {
-               // get the "fileas" tags for this post
-                $filedas = file_tag_file_to_list($categories, 'file');
+       if(strlen($categories)) {
+               // get the "fileas" tags for this post
+               $filedas = file_tag_file_to_list($categories, 'file');
        }
-        // save old and new categories, so we can determine what needs to be deleted from pconfig
-        $categories_old = $categories;
-        $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
-        $categories_new = $categories;
-        if(strlen($filedas)) {
-               // append the fileas stuff to the new categories list
-               $categories .= file_tag_list_to_file($filedas, 'file');
+       // save old and new categories, so we can determine what needs to be deleted from pconfig
+       $categories_old = $categories;
+       $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+       $categories_new = $categories;
+       if(strlen($filedas)) {
+               // append the fileas stuff to the new categories list
+               $categories .= file_tag_list_to_file($filedas, 'file');
        }
 
        // Work around doubled linefeeds in Tinymce 3.5b2
@@ -453,6 +453,7 @@ function item_post(&$a) {
 
        $tagged = array();
 
+       $private_forum = false;
 
        if(count($tags)) {
                foreach($tags as $tag) {
@@ -471,11 +472,22 @@ function item_post(&$a) {
                                continue;
 
                        $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); 
-                       if($success)
+                       if($success['replaced'])
                                $tagged[] = $tag;
+                       if(is_array($success['contact']) && intval($success['contact']['prv'])) {
+                               $private_forum = true;
+                               $private_id = $success['contact']['id'];
+                       }
                }
        }
 
+       if(($private_forum) && (! $parent) && (! $private)) {
+               // we tagged a private forum in a top level post and the message was public.
+               // Restrict it.
+               $private = 1;
+               $str_contact_allow = '<' . $private_id . '>'; 
+       }
+
        $attachments = '';
        $match = false;
 
@@ -716,26 +728,10 @@ function item_post(&$a) {
                        
                        }
 
-                       // We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
 
-                       if($self) {
-                               require_once('include/bb2diaspora.php');
-                               $signed_body = html_entity_decode(bb2diaspora($datarray['body']));
-                               $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-                               if($datarray['verb'] === ACTIVITY_LIKE) 
-                                       $signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
-                               else
-                               $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
-
-                               $authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
+                       // Store the comment signature information in case we need to relay to Diaspora
+                       store_diaspora_comment_sig($datarray, $author, ($self ? $a->user['prvkey'] : false), $parent_item, $post_id);
 
-                               q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
-                                       intval($post_id),
-                       dbesc($signed_text),
-                       dbesc(base64_encode($authorsig)),
-                       dbesc($myaddr)
-                       );
-                       }
                }
                else {
                        $parent = $post_id;
@@ -893,6 +889,7 @@ function item_content(&$a) {
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 
        $replaced = false;
+       $r = null;
 
        //is it a hash tag? 
        if(strpos($tag,'#') === 0) {
@@ -1023,5 +1020,49 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
                }
        }
 
-       return $replaced;       
+       return array('replaced' => $replaced, 'contact' => $r[0]);      
+}
+
+
+function store_diaspora_comment_sig($datarray, $author, $uprvkey, $parent_item, $post_id) {
+       // We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
+
+       $enabled = intval(get_config('system','diaspora_enabled'));
+       if(! $enabled) {
+               logger('mod_item: diaspora support disabled, not storing comment signature', LOGGER_DEBUG);
+               return;
+       }
+
+
+       logger('mod_item: storing diaspora comment signature');
+
+       require_once('include/bb2diaspora.php');
+       $signed_body = html_entity_decode(bb2diaspora($datarray['body']));
+
+//     $myaddr = $user['nickname'] . '@' . substr($baseurl, strpos($baseurl,'://') + 3);
+//     if( $author['network'] === NETWORK_DIASPORA)
+//             $diaspora_handle = $author['addr'];
+//     else {
+       // Only works for NETWORK_DFRN
+       $contact_baseurl_start = strpos($author['url'],'://') + 3;
+       $contact_baseurl_length = strpos($author['url'],'/profile') - $contact_baseurl_start;
+       $contact_baseurl = substr($author['url'], $contact_baseurl_start, $contact_baseurl_length);
+       $diaspora_handle = $author['nick'] . '@' . $contact_baseurl;
+//     }
+
+       $signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $diaspora_handle;
+
+       if( $uprvkey !== false )
+               $authorsig = base64_encode(rsa_sign($signed_text,$uprvkey,'sha256'));
+       else
+               $authorsig = '';
+
+       q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
+               intval($post_id),
+               dbesc($signed_text),
+               dbesc(base64_encode($authorsig)),
+               dbesc($diaspora_handle)
+       );
+
+       return;
 }