X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=623c2f2f8184404963922f2e7e8f0dd2723b8e80;hb=ba5ae17fe011a577eb850c353c198867158b80c9;hp=8ae99948a103e5addc49cefb83a86259622c410e;hpb=068d3dc7462fdd891498d9979f10e68eb824b617;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 8ae99948a1..623c2f2f81 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,4 +1,7 @@ 1); + $json = ['success' => 1]; echo json_encode($json); killme(); } - call_hooks('post_local_start', $_REQUEST); - // logger('postinput ' . file_get_contents('php://input')); + Addon::callHooks('post_local_start', $_REQUEST); + logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); - $api_source = ((x($_REQUEST, 'api_source') && $_REQUEST['api_source']) ? true : false); + $api_source = defaults($_REQUEST, 'api_source', false); $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - $return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : ''); - $preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0); + $return_path = defaults($_REQUEST, 'return', ''); + $preview = intval(defaults($_REQUEST, 'preview', 0)); /* * Check for doubly-submitted posts, and reject duplicates @@ -79,94 +77,56 @@ function item_post(App $a) { } // Is this a reply to something? - $parent = ((x($_REQUEST, 'parent')) ? intval($_REQUEST['parent']) : 0); - $parent_uri = ((x($_REQUEST, 'parent_uri')) ? trim($_REQUEST['parent_uri']) : ''); + $thr_parent = intval(defaults($_REQUEST, 'parent', 0)); + $thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', '')); - $parent_item = null; - $parent_contact = null; - $thr_parent = ''; - $parid = 0; - $r = false; - $objecttype = null; + $thr_parent_contact = null; - if ($parent || $parent_uri) { + $parent = 0; + $parent_item = null; + $parent_user = null; - $objecttype = ACTIVITY_OBJ_COMMENT; + $parent_contact = null; - if (! x($_REQUEST, 'type')) { - $_REQUEST['type'] = 'net-comment'; - } + $objecttype = null; + $profile_uid = defaults($_REQUEST, 'profile_uid', local_user()); - if ($parent) { - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", - intval($parent) - ); - } elseif ($parent_uri && local_user()) { - // This is coming from an API source, and we are logged in - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($parent_uri), - intval(local_user()) - ); + if ($thr_parent || $thr_parent_uri) { + if ($thr_parent) { + $parent_item = dba::selectFirst('item', [], ['id' => $thr_parent]); + } elseif ($thr_parent_uri) { + $parent_item = dba::selectFirst('item', [], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]); } // if this isn't the real parent of the conversation, find it - if (DBM::is_result($r)) { - $parid = $r[0]['parent']; - $parent_uri = $r[0]['uri']; - if ($r[0]['id'] != $r[0]['parent']) { - $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1", - intval($parid) - ); + if (DBM::is_result($parent_item)) { + + // The URI and the contact is taken from the direct parent which needn't to be the top parent + $thr_parent_uri = $parent_item['uri']; + $thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]); + + if ($parent_item['id'] != $parent_item['parent']) { + $parent_item = dba::selectFirst('item', [], ['id' => $parent_item['parent']]); } } - if (! DBM::is_result($r)) { - notice( t('Unable to locate original post.') . EOL); + if (!DBM::is_result($parent_item)) { + notice(t('Unable to locate original post.') . EOL); if (x($_REQUEST, 'return')) { goaway($return_path); } killme(); } - $parent_item = $r[0]; - $parent = $r[0]['id']; - - // multi-level threading - preserve the info but re-parent to our single level threading - //if(($parid) && ($parid != $parent)) - $thr_parent = $parent_uri; - - if ($parent_item['contact-id'] && $uid) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($parent_item['contact-id']), - intval($uid) - ); - if (DBM::is_result($r)) { - $parent_contact = $r[0]; - } - // If the contact id doesn't fit with the contact, then set the contact to null - $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent)); - if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS) - && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { - $parent_contact = Contact::getDetailsByURL($thrparent[0]["author-link"]); - - if (!isset($parent_contact["nick"])) { - $probed_contact = Probe::uri($thrparent[0]["author-link"]); - if ($probed_contact["network"] != NETWORK_FEED) { - $parent_contact = $probed_contact; - $parent_contact["nurl"] = normalise_link($probed_contact["url"]); - $parent_contact["thumb"] = $probed_contact["photo"]; - $parent_contact["micro"] = $probed_contact["photo"]; - $parent_contact["addr"] = $probed_contact["addr"]; - } - } - logger('no contact found: ' . print_r($thrparent, true), LOGGER_DEBUG); - } else { - logger('parent contact: ' . print_r($parent_contact, true), LOGGER_DEBUG); - } + $parent = $parent_item['id']; + $parent_user = $parent_item['uid']; - if ($parent_contact["nick"] == "") { - $parent_contact["nick"] = $parent_contact["name"]; - } + $parent_contact = Contact::getDetailsByURL($parent_item["author-link"]); + + $objecttype = ACTIVITY_OBJ_COMMENT; + + if (!x($_REQUEST, 'type')) { + $_REQUEST['type'] = 'net-comment'; } } @@ -174,44 +134,29 @@ function item_post(App $a) { 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); - $app = ((x($_REQUEST, 'source')) ? strip_tags($_REQUEST['source']) : ''); - $extid = ((x($_REQUEST, 'extid')) ? strip_tags($_REQUEST['extid']) : ''); - $object = ((x($_REQUEST, 'object')) ? $_REQUEST['object'] : ''); + $post_id = intval(defaults($_REQUEST, 'post_id', 0)); + $app = strip_tags(defaults($_REQUEST, 'source', '')); + $extid = strip_tags(defaults($_REQUEST, 'extid', '')); + $object = defaults($_REQUEST, 'object', ''); + + // Ensure that the user id in a thread always stay the same + if (!is_null($parent_user) && in_array($parent_user, [local_user(), 0])) { + $profile_uid = $parent_user; + } // Check for multiple posts with the same message id (when the post was created via API) if (($message_id != '') && ($profile_uid != 0)) { - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($message_id), - intval($profile_uid) - ); - - if (DBM::is_result($r)) { + if (dba::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) { logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG); return; } } - $allow_moderated = false; - - // here is where we are going to check for permission to post a moderated comment. - - // First check that the parent exists and it is a wall item. - - if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) { - notice(t('Permission denied.') . EOL) ; - if (x($_REQUEST, 'return')) { - goaway($return_path); - } - killme(); - } + // Allow commenting if it is an answer to a public post + $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]); - /* - * Now check that it is a page_type of PAGE_BLOG, and that valid personal details - * have been provided, and run any anti-spam plugins - */ - if ((! can_write_wall($a, $profile_uid)) && (! $allow_moderated)) { + // Now check that valid personal details have been provided + if (!can_write_wall($profile_uid) && !$allow_comment) { notice(t('Permission denied.') . EOL) ; if (x($_REQUEST, 'return')) { goaway($return_path); @@ -225,23 +170,12 @@ function item_post(App $a) { $orig_post = null; if ($post_id) { - $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval($profile_uid), - intval($post_id) - ); - if (! DBM::is_result($i)) { - killme(); - } - $orig_post = $i[0]; + $orig_post = dba::selectFirst('item', [], ['id' => $post_id]); } - $user = null; - - $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", - intval($profile_uid) - ); - if (DBM::is_result($r)) { - $user = $r[0]; + $user = dba::selectFirst('user', [], ['uid' => $profile_uid]); + if (!DBM::is_result($user) && !$parent) { + return; } if ($orig_post) { @@ -259,7 +193,7 @@ function item_post(App $a) { $title = notags(trim($_REQUEST['title'])); $body = escape_tags(trim($_REQUEST['body'])); $private = $orig_post['private']; - $pubmail_enable = $orig_post['pubmail']; + $pubmail_enabled = $orig_post['pubmail']; $network = $orig_post['network']; $guid = $orig_post['guid']; $extid = $orig_post['extid']; @@ -272,19 +206,17 @@ function item_post(App $a) { * been supplied via a form. */ /// @TODO use x($_REQUEST, 'foo') here - if (($api_source) - && (! array_key_exists('contact_allow', $_REQUEST)) - && (! array_key_exists('group_allow', $_REQUEST)) - && (! array_key_exists('contact_deny', $_REQUEST)) - && (! array_key_exists('group_deny', $_REQUEST))) { + if ($api_source + && !array_key_exists('contact_allow', $_REQUEST) + && !array_key_exists('group_allow', $_REQUEST) + && !array_key_exists('contact_deny', $_REQUEST) + && !array_key_exists('group_deny', $_REQUEST)) { $str_group_allow = $user['allow_gid']; $str_contact_allow = $user['allow_cid']; $str_group_deny = $user['deny_gid']; $str_contact_deny = $user['deny_cid']; } else { - // use the posted permissions - $str_group_allow = perms2str($_REQUEST['group_allow']); $str_contact_allow = perms2str($_REQUEST['contact_allow']); $str_group_deny = perms2str($_REQUEST['group_deny']); @@ -300,8 +232,7 @@ function item_post(App $a) { $network = notags(trim($_REQUEST['network'])); $guid = get_guid(32); - item_add_language_opt($_REQUEST); - $postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : ""; + $postopts = defaults($_REQUEST, 'postopts', ''); $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); @@ -327,28 +258,20 @@ function item_post(App $a) { $private = $parent_item['private']; } - $pubmail_enable = ((x($_REQUEST, 'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0); + $pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private; // if using the API, we won't see pubmail_enable - figure out if it should be set - - if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) { - $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1); - if (! $mail_disabled) { - /// @TODO Check if only pubmail is loaded, * loads all columns - $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", - intval(local_user()) - ); - if (DBM::is_result($r) && intval($r[0]['pubmail'])) { - $pubmail_enabled = true; - } + if ($api_source && $profile_uid && $profile_uid == local_user() && !$private) { + if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) { + $pubmail_enabled = dba::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']); } } - if (! strlen($body)) { + if (!strlen($body)) { if ($preview) { killme(); } - info(t('Empty post discarded.') . EOL ); + info(t('Empty post discarded.') . EOL); if (x($_REQUEST, 'return')) { goaway($return_path); } @@ -375,11 +298,10 @@ function item_post(App $a) { $self = false; $contact_id = 0; - if ((local_user()) && (local_user() == $profile_uid)) { + if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) { $self = true; - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", - intval($_SESSION['uid'])); - } elseif(remote_user()) { + $author = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]); + } elseif (remote_user()) { if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { if ($v['uid'] == $profile_uid) { @@ -389,28 +311,19 @@ function item_post(App $a) { } } if ($contact_id) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", - intval($contact_id) - ); + $author = dba::selectFirst('contact', [], ['id' => $contact_id]); } } - if (DBM::is_result($r)) { - $author = $r[0]; + if (DBM::is_result($author)) { $contact_id = $author['id']; } // get contact info for owner - - if ($profile_uid == local_user()) { + if ($profile_uid == local_user() || $allow_comment) { $contact_record = $author; } else { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", - intval($profile_uid) - ); - if (DBM::is_result($r)) { - $contact_record = $r[0]; - } + $contact_record = dba::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]); } $post_type = notags(trim($_REQUEST['type'])); @@ -429,47 +342,31 @@ function item_post(App $a) { $tags = get_tags($body); - /* - * add a statusnet style reply tag if the original post was from there - * and we are replying, and there isn't one already - */ - if ($parent && ($parent_contact['network'] == NETWORK_OSTATUS)) { - $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; - - if (!in_array($contact, $tags)) { - $body = $contact . ' ' . $body; - $tags[] = $contact; - } - - $toplevel_contact = ""; - $toplevel_parent = q("SELECT `contact`.* FROM `contact` - INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link` - WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent)); - if (DBM::is_result($toplevel_parent)) { - if (!empty($toplevel_parent[0]['addr'])) { - $toplevel_contact = '@' . $toplevel_parent[0]['addr']; - } else { - $toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id']; + // Add a tag if the parent contact is from OStatus (This will notify them during delivery) + if ($parent) { + if ($thr_parent_contact['network'] == NETWORK_OSTATUS) { + $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]'; + if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) { + $tags[] = $contact; } - } else { - $toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent)); - $toplevel_contact = '@[url=' . $toplevel_parent[0]['author-link'] . ']' . $toplevel_parent[0]['author-name'] . '[/url]'; } - if (!in_array($toplevel_contact, $tags)) { - $tags[] = $toplevel_contact; + if ($parent_contact['network'] == NETWORK_OSTATUS) { + $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; + if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) { + $tags[] = $contact; + } } } - $tagged = array(); + $tagged = []; $private_forum = false; $only_to_forum = false; - $forum_contact = array(); + $forum_contact = []; if (count($tags)) { foreach ($tags as $tag) { - $tag_type = substr($tag, 0, 1); if ($tag_type == '#') { @@ -481,7 +378,7 @@ function item_post(App $a) { * Robert Johnson should be first in the $tags array */ $fullnametagged = false; - /// @TODO $tagged is initialized above if() block and is not filled, maybe old-lost code? + /// @TODO $tagged is initialized above if () block and is not filled, maybe old-lost code? foreach ($tagged as $nextTag) { if (stristr($nextTag, $tag . ' ')) { $fullnametagged = true; @@ -492,7 +389,7 @@ function item_post(App $a) { continue; } - $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network); + $success = handle_tag($a, $body, $inform, $str_tags, local_user() ? local_user() : $profile_uid, $tag, $network); if ($success['replaced']) { $tagged[] = $tag; } @@ -512,6 +409,8 @@ function item_post(App $a) { } } + $original_contact_id = $contact_id; + if (!$parent && count($forum_contact) && ($private_forum || $only_to_forum)) { // we tagged a forum in a top level post. Now we change the post $private = $private_forum; @@ -541,6 +440,7 @@ function item_post(App $a) { $match = null; + /// @todo these lines should be moved to Model/Photo if (!$preview && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) { $images = $match[2]; if (count($images)) { @@ -548,37 +448,28 @@ function item_post(App $a) { $objecttype = ACTIVITY_OBJ_IMAGE; foreach ($images as $image) { - if (! stristr($image,System::baseUrl() . '/photo/')) { + if (!stristr($image, System::baseUrl() . '/photo/')) { continue; } $image_uri = substr($image,strrpos($image,'/') + 1); $image_uri = substr($image_uri,0, strpos($image_uri,'-')); - if (! strlen($image_uri)) { + if (!strlen($image_uri)) { continue; } - $srch = '<' . intval($contact_id) . '>'; - $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' - AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", - dbesc($srch), - dbesc($image_uri), - intval($profile_uid) - ); + // Ensure to only modify photos that you own + $srch = '<' . intval($original_contact_id) . '>'; - if (! DBM::is_result($r)) { + $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', + 'resource-id' => $image_uri, 'uid' => $profile_uid]; + if (!dba::exists('photo', $condition)) { continue; } - $r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' - WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ", - dbesc($str_contact_allow), - dbesc($str_group_allow), - dbesc($str_contact_deny), - dbesc($str_group_deny), - dbesc($image_uri), - intval($profile_uid), - dbesc( t('Wall Photos')) - ); + $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, + 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny]; + $condition = ['resource-id' => $image_uri, 'uid' => $profile_uid, 'album' => t('Wall Photos')]; + dba::update('photo', $fields, $condition); } } } @@ -589,25 +480,24 @@ function item_post(App $a) { */ $match = false; - if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) { + /// @todo these lines should be moved to Model/Attach (Once it exists) + if (!$preview && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) { $attaches = $match[1]; if (count($attaches)) { foreach ($attaches as $attach) { - $r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval($profile_uid), - intval($attach) - ); - if (DBM::is_result($r)) { - $r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' - WHERE `uid` = %d AND `id` = %d", - dbesc($str_contact_allow), - dbesc($str_group_allow), - dbesc($str_contact_deny), - dbesc($str_group_deny), - intval($profile_uid), - intval($attach) - ); + // Ensure to only modify attachments that you own + $srch = '<' . intval($original_contact_id) . '>'; + + $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', + 'id' => $attach]; + if (!dba::exists('attach', $condition)) { + continue; } + + $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, + 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny]; + $condition = ['id' => $attach]; + dba::update('attach', $fields, $condition); } } } @@ -650,15 +540,15 @@ function item_post(App $a) { if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) { foreach ($match[2] as $mtch) { - $r = q("SELECT `id`,`filename`,`filesize`,`filetype` FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval($profile_uid), - intval($mtch) - ); - if (DBM::is_result($r)) { + $fields = ['id', 'filename', 'filesize', 'filetype']; + $attachment = dba::selectFirst('attach', $fields, ['id' => $mtch]); + if (DBM::is_result($attachment)) { if (strlen($attachments)) { $attachments .= ','; } - $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]'; + $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $attachment['id'] . + '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] . + '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]'; } $body = str_replace($match[1],'',$body); } @@ -670,31 +560,31 @@ function item_post(App $a) { $wall = 1; } - if (! strlen($verb)) { - $verb = ACTIVITY_POST ; + if (!strlen($verb)) { + $verb = ACTIVITY_POST; } if ($network == "") { $network = NETWORK_DFRN; } - $gravity = (($parent) ? 6 : 0 ); + $gravity = ($parent ? 6 : 0); // even if the post arrived via API we are considering that it // originated on this site by default for determining relayability. - $origin = ((x($_REQUEST, 'origin')) ? intval($_REQUEST['origin']) : 1); + $origin = intval(defaults($_REQUEST, 'origin', 1)); - $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); + $notify_type = ($parent ? 'comment-new' : 'wall-new'); - $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid)); + $uri = ($message_id ? $message_id : item_new_uri($a->get_hostname(), $profile_uid, $guid)); - // Fallback so that we alway have a thr-parent - if (!$thr_parent) { - $thr_parent = $uri; + // Fallback so that we alway have a parent uri + if (!$thr_parent_uri || !$parent) { + $thr_parent_uri = $uri; } - $datarray = array(); + $datarray = []; $datarray['uid'] = $profile_uid; $datarray['type'] = $post_type; $datarray['wall'] = $wall; @@ -732,34 +622,32 @@ function item_post(App $a) { $datarray['deny_cid'] = $str_contact_deny; $datarray['deny_gid'] = $str_group_deny; $datarray['private'] = $private; - $datarray['pubmail'] = $pubmail_enable; + $datarray['pubmail'] = $pubmail_enabled; $datarray['attach'] = $attachments; $datarray['bookmark'] = intval($bookmark); - $datarray['thr-parent'] = $thr_parent; + + // This is not a bug. The item store function changes 'parent-uri' to 'thr-parent' and fetches 'parent-uri' new. (We should change this) + $datarray['parent-uri'] = $thr_parent_uri; + $datarray['postopts'] = $postopts; $datarray['origin'] = $origin; - $datarray['moderated'] = $allow_moderated; - $datarray['gcontact-id'] = GlobalContact::getId(array("url" => $datarray['author-link'], "network" => $datarray['network'], - "photo" => $datarray['author-avatar'], "name" => $datarray['author-name'])); + $datarray['moderated'] = false; + $datarray['gcontact-id'] = GContact::getId(["url" => $datarray['author-link'], "network" => $datarray['network'], + "photo" => $datarray['author-avatar'], "name" => $datarray['author-name']]); $datarray['object'] = $object; /* - * These fields are for the convenience of plugins... + * These fields are for the convenience of addons... * 'self' if true indicates the owner is posting on their own wall * If parent is 0 it is a top-level post. */ $datarray['parent'] = $parent; $datarray['self'] = $self; -// $datarray['prvnets'] = $user['prvnets']; // This triggers posts via API and the mirror functions $datarray['api_source'] = $api_source; - $datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri']; - $datarray['plink'] = System::baseUrl() . '/display/' . urlencode($datarray['guid']); - $datarray['last-child'] = 1; - $datarray['visible'] = 1; - + // This field is for storing the raw conversation data $datarray['protocol'] = PROTOCOL_DFRN; $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']); @@ -776,30 +664,27 @@ function item_post(App $a) { $datarray['edit'] = true; } - // Search for hashtags - item_body_set_hashtags($datarray); - // preview mode - prepare the body for display and send it via json if ($preview) { require_once 'include/conversation.php'; // We set the datarray ID to -1 because in preview mode the dataray // doesn't have an ID. $datarray["id"] = -1; - $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true); + $o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true); logger('preview: ' . $o); - echo json_encode(array('preview' => $o)); + echo json_encode(['preview' => $o]); killme(); } - call_hooks('post_local',$datarray); + Addon::callHooks('post_local',$datarray); if (x($datarray, 'cancel')) { - logger('mod_item: post cancelled by plugin.'); + logger('mod_item: post cancelled by addon.'); if ($return_path) { goaway($return_path); } - $json = array('cancel' => 1); + $json = ['cancel' => 1]; if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) { $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload']; } @@ -808,35 +693,29 @@ function item_post(App $a) { killme(); } - // Fill the cache field - put_item_in_cache($datarray); + if ($orig_post) { - $datarray = store_conversation($datarray); + // Fill the cache field + // This could be done in Item::update as well - but we have to check for the existance of some fields. + put_item_in_cache($datarray); - if ($orig_post) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d", - dbesc($datarray['title']), - dbesc($datarray['body']), - dbesc($datarray['tag']), - dbesc($datarray['attach']), - dbesc($datarray['file']), - dbesc($datarray['rendered-html']), - dbesc($datarray['rendered-hash']), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($post_id), - intval($profile_uid) - ); - - create_tags_from_item($post_id); - create_files_from_item($post_id); - update_thread($post_id); + $fields = [ + 'title' => $datarray['title'], + 'body' => $datarray['body'], + 'tag' => $datarray['tag'], + 'attach' => $datarray['attach'], + 'file' => $datarray['file'], + 'rendered-html' => $datarray['rendered-html'], + 'rendered-hash' => $datarray['rendered-hash'], + 'edited' => datetime_convert(), + 'changed' => datetime_convert()]; + + Item::update($fields, ['id' => $post_id]); // update filetags in pconfig file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); - Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $post_id); - if ((x($_REQUEST, 'return')) && strlen($return_path)) { + if (x($_REQUEST, 'return') && strlen($return_path)) { logger('return: ' . $return_path); goaway($return_path); } @@ -845,125 +724,31 @@ function item_post(App $a) { $post_id = 0; } - dba::transaction(); - - $r = q("INSERT INTO `item` (`guid`, `extid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`, - `owner-name`,`owner-link`,`owner-avatar`, `owner-id`, - `author-name`, `author-link`, `author-avatar`, `author-id`, - `created`, `edited`, `commented`, `received`, `changed`, - `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, - `tag`, `inform`, `verb`, `object-type`, `postopts`, - `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, - `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file`, - `rendered-html`, `rendered-hash`, `gcontact-id`, `object`, - `parent`, `parent-uri`, `plink`, `last-child`, `visible`) - VALUES('%s', '%s', %d, '%s', %d, %d, '%s', %d, - '%s', '%s', '%s', %d, - '%s', '%s', '%s', %d, - '%s', '%s', '%s', '%s', '%s', - '%s', '%s', '%s', '%s', '%s', '%s', '%s', - '%s', '%s', '%s', '%s', '%s', - '%s', '%s', '%s', '%s', %d, - %d, '%s', %d, %d, %d, '%s', - '%s', '%s', %d, '%s', - %d, '%s', '%s', %d, %d)", - dbesc($datarray['guid']), - dbesc($datarray['extid']), - intval($datarray['uid']), - dbesc($datarray['type']), - intval($datarray['wall']), - intval($datarray['gravity']), - dbesc($datarray['network']), - intval($datarray['contact-id']), - dbesc($datarray['owner-name']), - dbesc($datarray['owner-link']), - dbesc($datarray['owner-avatar']), - intval($datarray['owner-id']), - dbesc($datarray['author-name']), - dbesc($datarray['author-link']), - dbesc($datarray['author-avatar']), - intval($datarray['author-id']), - dbesc($datarray['created']), - dbesc($datarray['edited']), - dbesc($datarray['commented']), - dbesc($datarray['received']), - dbesc($datarray['changed']), - dbesc($datarray['uri']), - dbesc($datarray['thr-parent']), - dbesc($datarray['title']), - dbesc($datarray['body']), - dbesc($datarray['app']), - dbesc($datarray['location']), - dbesc($datarray['coord']), - dbesc($datarray['tag']), - dbesc($datarray['inform']), - dbesc($datarray['verb']), - dbesc($datarray['object-type']), - dbesc($datarray['postopts']), - dbesc($datarray['allow_cid']), - dbesc($datarray['allow_gid']), - dbesc($datarray['deny_cid']), - dbesc($datarray['deny_gid']), - intval($datarray['private']), - intval($datarray['pubmail']), - dbesc($datarray['attach']), - intval($datarray['bookmark']), - intval($datarray['origin']), - intval($datarray['moderated']), - dbesc($datarray['file']), - dbesc($datarray['rendered-html']), - dbesc($datarray['rendered-hash']), - intval($datarray['gcontact-id']), - dbesc($datarray['object']), - intval($datarray['parent']), - dbesc($datarray['parent-uri']), - dbesc($datarray['plink']), - intval($datarray['last-child']), - intval($datarray['visible']) - ); + unset($datarray['edit']); + unset($datarray['self']); + unset($datarray['api_source']); - if (DBM::is_result($r)) { - $post_id = dba::lastInsertId(); - } else { - logger('mod_item: unable to create post.'); - $post_id = 0; - } + $post_id = item_store($datarray); - if ($post_id == 0) { - dba::commit(); - logger('mod_item: unable to retrieve post that was just stored.'); - notice(t('System error. Post not saved.') . EOL); + if (!$post_id) { + logger("Item wasn't stored."); goaway($return_path); - // NOTREACHED } - logger('mod_item: saved item ' . $post_id); + $datarray = dba::selectFirst('item', [], ['id' => $post_id]); - $datarray["id"] = $post_id; - - item_set_last_item($datarray); + if (!DBM::is_result($datarray)) { + logger("Item with id ".$post_id." couldn't be fetched."); + goaway($return_path); + } // update filetags in pconfig - file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + file_tag_update_pconfig($uid, $categories_old, $categories_new, 'category'); + // These notifications are sent if someone else is commenting other your wall if ($parent) { - - // This item is the last leaf and gets the comment box, clear any ancestors - $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d AND `last-child` AND `id` != %d", - dbesc(datetime_convert()), - intval($parent), - intval($post_id) - ); - - // update the commented timestamp on the parent - q("UPDATE `item` SET `visible` = 1, `commented` = '%s', `changed` = '%s' WHERE `id` = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($parent) - ); - if ($contact_record != $author) { - notification(array( + notification([ 'type' => NOTIFY_COMMENT, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], @@ -979,23 +764,14 @@ function item_post(App $a) { 'otype' => 'item', 'parent' => $parent, 'parent_uri' => $parent_item['uri'] - )); - + ]); } - // Store the comment signature information in case we need to relay to Diaspora Diaspora::storeCommentSignature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id); - } else { - $parent = $post_id; - - $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", - intval($parent), - intval($post_id)); - if (($contact_record != $author) && !count($forum_contact)) { - notification(array( + notification([ 'type' => NOTIFY_WALL, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], @@ -1009,34 +785,34 @@ function item_post(App $a) { 'source_photo' => $datarray['author-avatar'], 'verb' => ACTIVITY_POST, 'otype' => 'item' - )); + ]); } } - call_hooks('post_local_end', $datarray); + Addon::callHooks('post_local_end', $datarray); if (strlen($emailcc) && $profile_uid == local_user()) { $erecips = explode(',', $emailcc); if (count($erecips)) { foreach ($erecips as $recip) { $addr = trim($recip); - if (! strlen($addr)) { + if (!strlen($addr)) { continue; } - $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username']) + $disclaimer = '
' . sprintf(t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username']) . '
'; - $disclaimer .= sprintf( t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; + $disclaimer .= sprintf(t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; if (!$datarray['title']=='') { - $subject = email_header_encode($datarray['title'], 'UTF-8'); + $subject = Email::encodeHeader($datarray['title'], 'UTF-8'); } else { - $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8'); + $subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf(t('%s posted an update.'), $a->user['username']), 'UTF-8'); } $link = '' . $a->user['username'] . '

'; $html = prepare_body($datarray); $message = '' . $link . $html . $disclaimer . ''; include_once 'include/html2plain.php'; - $params = array ( + $params = [ 'fromName' => $a->user['username'], 'fromEmail' => $a->user['email'], 'toEmail' => $addr, @@ -1044,28 +820,17 @@ function item_post(App $a) { 'messageSubject' => $subject, 'htmlVersion' => $message, 'textVersion' => html2plain($html.$disclaimer) - ); + ]; Emailer::send($params); } } } - if ($post_id == $parent) { - add_thread($post_id); - } else { - update_thread($parent, true); - } - - dba::commit(); - - create_tags_from_item($post_id); - create_files_from_item($post_id); - // Insert an item entry for UID=0 for global entries. // We now do it in the background to save some time. // This is important in interactive environments like the frontend or the API. // We don't fork a new process since this is done anyway with the following command - Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowEntry", $post_id); + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "CreateShadowEntry", $post_id); // Call the background process that is delivering the item to the receivers Worker::add(PRIORITY_HIGH, "Notifier", $notify_type, $post_id); @@ -1087,7 +852,7 @@ function item_post_return($baseurl, $api_source, $return_path) { goaway($return_path); } - $json = array('success' => 1); + $json = ['success' => 1]; if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) { $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; } @@ -1102,7 +867,7 @@ function item_post_return($baseurl, $api_source, $return_path) { function item_content(App $a) { - if ((! local_user()) && (! remote_user())) { + if (!local_user() && !remote_user()) { return; } @@ -1110,10 +875,14 @@ function item_content(App $a) { $o = ''; if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { - $o = drop_item($a->argv[2], !is_ajax()); + if (is_ajax()) { + $o = Item::delete($a->argv[2]); + } else { + $o = drop_item($a->argv[2]); + } if (is_ajax()) { // ajax return: [, 0 (no perm) | ] - echo json_encode(array(intval($a->argv[2]), intval($o))); + echo json_encode([intval($a->argv[2]), intval($o)]); killme(); } } @@ -1156,22 +925,10 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n // Checking for the alias that is used for OStatus $pattern = "/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism"; if (preg_match($pattern, $tag, $matches)) { - - $r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0", - normalise_link($matches[1])); - if (!DBM::is_result($r)) { - $r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''", - normalise_link($matches[1])); - } - if (DBM::is_result($r)) { - $data = $r[0]; - } else { - $data = Probe::uri($matches[1]); - } - + $data = Contact::getDetailsByURL($matches[1]); if ($data["alias"] != "") { - $newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]'; - if (!stristr($str_tags, $newtag)) { + $newtag = '@[url=' . $data["alias"] . ']' . $data["nick"] . '[/url]'; + if (!stripos($str_tags, '[url=' . $data["alias"] . ']')) { if (strlen($str_tags)) { $str_tags .= ','; } @@ -1192,124 +949,68 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n $name = $nameparts[0]; // Try to detect the contact in various ways - if ((strpos($name, '@')) || (strpos($name, 'http://'))) { - // Is it in format @user@domain.tld or @http://domain.tld/...? - - // First check the contact table for the address - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact` - WHERE `addr` = '%s' AND `uid` = %d AND - (`network` != '%s' OR (`notify` != '' AND `alias` != '')) - LIMIT 1", - dbesc($name), - intval($profile_uid), - dbesc(NETWORK_OSTATUS) - ); - - // Then check in the contact table for the url - if (!DBM::is_result($r)) { - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact` - WHERE `nurl` = '%s' AND `uid` = %d AND - (`network` != '%s' OR (`notify` != '' AND `alias` != '')) - LIMIT 1", - dbesc(normalise_link($name)), - intval($profile_uid), - dbesc(NETWORK_OSTATUS) - ); - } - - // Then check in the global contacts for the address - if (!DBM::is_result($r)) { - $r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact` - WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != '')) - LIMIT 1", - dbesc($name), - dbesc(NETWORK_OSTATUS) - ); - } - - // Then check in the global contacts for the url - if (!DBM::is_result($r)) { - $r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact` - WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != '')) - LIMIT 1", - dbesc(normalise_link($name)), - dbesc(NETWORK_OSTATUS) - ); - } - - if (!DBM::is_result($r)) { - $probed = Probe::uri($name); - if ($result['network'] != NETWORK_PHANTOM) { - GlobalContact::update($probed); - $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link($probed["url"]))); - } - } + if (strpos($name, 'http://')) { + // At first we have to ensure that the contact exists + Contact::getIdForURL($name); + + // Now we should have something + $contact = Contact::getDetailsByURL($name); + } elseif (strpos($name, '@')) { + // This function automatically probes when no entry was found + $contact = Contact::getDetailsByAddr($name); } else { - $r = false; + $contact = false; + $fields = ['id', 'url', 'nick', 'name', 'alias', 'network']; + if (strrpos($name, '+')) { // Is it in format @nick+number? $tagcid = intval(substr($name, strrpos($name, '+') + 1)); + $contact = dba::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]); + } - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($tagcid), - intval($profile_uid) - ); + // select someone by nick or attag in the current network + if (!DBM::is_result($contact) && ($network != "")) { + $condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?", + $name, $name, $network, $profile_uid]; + $contact = dba::selectFirst('contact', $fields, $condition); } - // select someone by attag or nick and the name passed in the current network - if(!DBM::is_result($r) && ($network != "")) - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), - dbesc($network), - intval($profile_uid) - ); - - //select someone from this user's contacts by name in the current network - if (!DBM::is_result($r) && ($network != "")) { - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1", - dbesc($name), - dbesc($network), - intval($profile_uid) - ); + //select someone by name in the current network + if (!DBM::is_result($contact) && ($network != "")) { + $condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid]; + $contact = dba::selectFirst('contact', $fields, $condition); } - // select someone by attag or nick and the name passed in - if(!DBM::is_result($r)) { - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", - dbesc($name), - dbesc($name), - intval($profile_uid) - ); + // select someone by nick or attag in any network + if (!DBM::is_result($contact)) { + $condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid]; + $contact = dba::selectFirst('contact', $fields, $condition); } - // select someone from this user's contacts by name - if(!DBM::is_result($r)) { - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", - dbesc($name), - intval($profile_uid) - ); + // select someone by name in any network + if (!DBM::is_result($contact)) { + $condition = ['name' => $name, 'uid' => $profile_uid]; + $contact = dba::selectFirst('contact', $fields, $condition); } } - if (DBM::is_result($r)) { - if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) { + if ($contact) { + if (strlen($inform) && (isset($contact["notify"]) || isset($contact["id"]))) { $inform .= ','; } - if (isset($r[0]["id"])) { - $inform .= 'cid:' . $r[0]["id"]; - } elseif (isset($r[0]["notify"])) { - $inform .= $r[0]["notify"]; + if (isset($contact["id"])) { + $inform .= 'cid:' . $contact["id"]; + } elseif (isset($contact["notify"])) { + $inform .= $contact["notify"]; } - $profile = $r[0]["url"]; - $alias = $r[0]["alias"]; - $newname = $r[0]["nick"]; - if (($newname == "") || (($r[0]["network"] != NETWORK_OSTATUS) && ($r[0]["network"] != NETWORK_TWITTER) - && ($r[0]["network"] != NETWORK_STATUSNET) && ($r[0]["network"] != NETWORK_APPNET))) { - $newname = $r[0]["name"]; + $profile = $contact["url"]; + $alias = $contact["alias"]; + $newname = $contact["nick"]; + if (($newname == "") || (($contact["network"] != NETWORK_OSTATUS) && ($contact["network"] != NETWORK_TWITTER) + && ($contact["network"] != NETWORK_STATUSNET) && ($contact["network"] != NETWORK_APPNET))) { + $newname = $contact["name"]; } } @@ -1321,7 +1022,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n $newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]'; $body = str_replace($tag_type . $name, $newtag, $body); // append tag to str_tags - if (! stristr($str_tags, $newtag)) { + if (!stristr($str_tags, $newtag)) { if (strlen($str_tags)) { $str_tags .= ','; } @@ -1334,7 +1035,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n */ if (strlen($alias)) { $newtag = '@[url=' . $alias . ']' . $newname . '[/url]'; - if (! stristr($str_tags, $newtag)) { + if (!stripos($str_tags, '[url=' . $alias . ']')) { if (strlen($str_tags)) { $str_tags .= ','; } @@ -1344,5 +1045,5 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n } } - return array('replaced' => $replaced, 'contact' => $r[0]); + return ['replaced' => $replaced, 'contact' => $contact]; }