X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=e56e4c68d963e59c906b90b68578ed5d0c3ee232;hb=c947b7f211e2468561a8864b2141dfcbfe65b63b;hp=b1c0355e01a5c2032fd73a1aac76c5f7056aa486;hpb=c0cb1a194e0392233f3644557c8e4bcf84f5a686;p=friendica.git diff --git a/mod/item.php b/mod/item.php index b1c0355e01..e56e4c68d9 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,9 +1,22 @@ . + * * This is the POST destination for most all locally posted * text stuff. This function handles status, wall-to-wall status, * local comments, and remote coments that are posted on this site @@ -16,29 +29,30 @@ */ use Friendica\App; -use Friendica\Content\Pager; +use Friendica\Content\Item as ItemHelper; use Friendica\Content\Text\BBCode; -use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; +use Friendica\Core\Renderer; use Friendica\Core\Session; +use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Attach; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\FileTag; use Friendica\Model\Item; +use Friendica\Model\Notify\Type; use Friendica\Model\Photo; -use Friendica\Model\Term; +use Friendica\Model\Tag; +use Friendica\Network\HTTPException; +use Friendica\Object\EMail\ItemCCEMail; +use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; -use Friendica\Protocol\Email; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Emailer; use Friendica\Util\Security; use Friendica\Util\Strings; use Friendica\Worker\Delivery; @@ -47,29 +61,31 @@ require_once __DIR__ . '/../include/items.php'; function item_post(App $a) { if (!Session::isAuthenticated()) { - return 0; + throw new HTTPException\ForbiddenException(); } $uid = local_user(); if (!empty($_REQUEST['dropitems'])) { $arr_drop = explode(',', $_REQUEST['dropitems']); - drop_items($arr_drop); + foreach ($arr_drop as $item) { + Item::deleteForUser(['id' => $item], $uid); + } + $json = ['success' => 1]; - echo json_encode($json); - exit(); + System::jsonExit($json); } Hook::callAll('post_local_start', $_REQUEST); - Logger::log('postvars ' . print_r($_REQUEST, true), Logger::DATA); + Logger::debug('postvars', ['_REQUEST' => $_REQUEST]); - $api_source = defaults($_REQUEST, 'api_source', false); + $api_source = $_REQUEST['api_source'] ?? false; $message_id = ((!empty($_REQUEST['message_id']) && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - $return_path = defaults($_REQUEST, 'return', ''); - $preview = intval(defaults($_REQUEST, 'preview', 0)); + $return_path = $_REQUEST['return'] ?? ''; + $preview = intval($_REQUEST['preview'] ?? 0); /* * Check for doubly-submitted posts, and reject duplicates @@ -78,28 +94,23 @@ function item_post(App $a) { */ if (!$preview && !empty($_REQUEST['post_id_random'])) { if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { - Logger::log("item post: duplicate post", Logger::DEBUG); - item_post_return(System::baseUrl(), $api_source, $return_path); + Logger::info('item post: duplicate post'); + item_post_return(DI::baseUrl(), $api_source, $return_path); } else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; } } // Is this a reply to something? - $toplevel_item_id = intval(defaults($_REQUEST, 'parent', 0)); - $thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', '')); - - $thread_parent_id = 0; - $thread_parent_contact = null; + $toplevel_item_id = intval($_REQUEST['parent'] ?? 0); + $thr_parent_uri = trim($_REQUEST['parent_uri'] ?? ''); $toplevel_item = null; $parent_user = null; - $parent_contact = null; - $objecttype = null; - $profile_uid = defaults($_REQUEST, 'profile_uid', local_user()); - $posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE); + $profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user(); + $posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE; if ($toplevel_item_id || $thr_parent_uri) { if ($toplevel_item_id) { @@ -111,37 +122,35 @@ function item_post(App $a) { // if this isn't the top-level parent of the conversation, find it if (DBA::isResult($toplevel_item)) { // The URI and the contact is taken from the direct parent which needn't to be the top parent - $thread_parent_id = $toplevel_item['id']; $thr_parent_uri = $toplevel_item['uri']; - $thread_parent_contact = Contact::getDetailsByURL($toplevel_item["author-link"]); - if ($toplevel_item['id'] != $toplevel_item['parent']) { - $toplevel_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $toplevel_item['parent']]); + if ($toplevel_item['gravity'] != GRAVITY_PARENT) { + $toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]); } } if (!DBA::isResult($toplevel_item)) { - notice(L10n::t('Unable to locate original post.') . EOL); - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + notice(DI::l10n()->t('Unable to locate original post.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.')); } $toplevel_item_id = $toplevel_item['id']; $parent_user = $toplevel_item['uid']; - $objecttype = ACTIVITY_OBJ_COMMENT; + $objecttype = Activity\ObjectType::COMMENT; } if ($toplevel_item_id) { - Logger::info('mod_item: item_post parent=' . $toplevel_item_id); + Logger::info('mod_item: item_post', ['parent' => $toplevel_item_id]); } - $post_id = intval(defaults($_REQUEST, 'post_id', 0)); - $app = strip_tags(defaults($_REQUEST, 'source', '')); - $extid = strip_tags(defaults($_REQUEST, 'extid', '')); - $object = defaults($_REQUEST, 'object', ''); + $post_id = intval($_REQUEST['post_id'] ?? 0); + $app = strip_tags($_REQUEST['source'] ?? ''); + $extid = strip_tags($_REQUEST['extid'] ?? ''); + $object = $_REQUEST['object'] ?? ''; // Don't use "defaults" here. It would turn 0 to 1 if (!isset($_REQUEST['wall'])) { @@ -158,7 +167,7 @@ function item_post(App $a) { // Check for multiple posts with the same message id (when the post was created via API) if (($message_id != '') && ($profile_uid != 0)) { if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) { - Logger::log("Message with URI ".$message_id." already exists for user ".$profile_uid, Logger::DEBUG); + Logger::info('Message already exists for user', ['uri' => $message_id, 'uid' => $profile_uid]); return 0; } } @@ -168,13 +177,12 @@ function item_post(App $a) { // Now check that valid personal details have been provided if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { - notice(L10n::t('Permission denied.') . EOL); - - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + notice(DI::l10n()->t('Permission denied.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } // Init post instance @@ -194,20 +202,20 @@ function item_post(App $a) { $categories = ''; $postopts = ''; $emailcc = ''; - $body = defaults($_REQUEST, 'body', ''); - $has_attachment = defaults($_REQUEST, 'has_attachment', 0); + $body = $_REQUEST['body'] ?? ''; + $has_attachment = $_REQUEST['has_attachment'] ?? 0; // If we have a speparate attachment, we need to add it to the body. if (!empty($has_attachment)) { - $attachment_type = defaults($_REQUEST, 'attachment_type', ''); - $attachment_title = defaults($_REQUEST, 'attachment_title', ''); - $attachment_text = defaults($_REQUEST, 'attachment_text', ''); + $attachment_type = $_REQUEST['attachment_type'] ?? ''; + $attachment_title = $_REQUEST['attachment_title'] ?? ''; + $attachment_text = $_REQUEST['attachment_text'] ?? ''; - $attachment_url = hex2bin(defaults($_REQUEST, 'attachment_url', '')); - $attachment_img_src = hex2bin(defaults($_REQUEST, 'attachment_img_src', '')); + $attachment_url = hex2bin($_REQUEST['attachment_url'] ?? ''); + $attachment_img_src = hex2bin($_REQUEST['attachment_img_src'] ?? ''); - $attachment_img_width = defaults($_REQUEST, 'attachment_img_width', 0); - $attachment_img_height = defaults($_REQUEST, 'attachment_img_height', 0); + $attachment_img_width = $_REQUEST['attachment_img_width'] ?? 0; + $attachment_img_height = $_REQUEST['attachment_img_height'] ?? 0; $attachment = [ 'type' => $attachment_type, 'title' => $attachment_title, @@ -229,6 +237,9 @@ function item_post(App $a) { $body .= $att_bbcode; } + // Convert links with empty descriptions to links without an explicit description + $body = preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $body); + if (!empty($orig_post)) { $str_group_allow = $orig_post['allow_gid']; $str_contact_allow = $orig_post['allow_cid']; @@ -239,51 +250,46 @@ function item_post(App $a) { $verb = $orig_post['verb']; $objecttype = $orig_post['object-type']; $app = $orig_post['app']; - $categories = $orig_post['file']; + $categories = $orig_post['file'] ?? ''; $title = Strings::escapeTags(trim($_REQUEST['title'])); - $body = Strings::escapeHtml(trim($body)); + $body = trim($body); $private = $orig_post['private']; $pubmail_enabled = $orig_post['pubmail']; $network = $orig_post['network']; $guid = $orig_post['guid']; $extid = $orig_post['extid']; - } else { - - /* - * if coming from the API and no privacy settings are set, - * use the user default permissions - as they won't have - * been supplied via a form. - */ - 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(defaults($_REQUEST, 'group_allow', '')); - $str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', '')); - $str_group_deny = perms2str(defaults($_REQUEST, 'group_deny', '')); - $str_contact_deny = perms2str(defaults($_REQUEST, 'contact_deny', '')); - } - - $title = Strings::escapeTags(trim(defaults($_REQUEST, 'title' , ''))); - $location = Strings::escapeTags(trim(defaults($_REQUEST, 'location', ''))); - $coord = Strings::escapeTags(trim(defaults($_REQUEST, 'coord' , ''))); - $verb = Strings::escapeTags(trim(defaults($_REQUEST, 'verb' , ''))); - $emailcc = Strings::escapeTags(trim(defaults($_REQUEST, 'emailcc' , ''))); - $body = Strings::escapeHtml(trim($body)); - $network = Strings::escapeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN))); + $str_contact_allow = ''; + $str_group_allow = ''; + $str_contact_deny = ''; + $str_group_deny = ''; + + if (($_REQUEST['visibility'] ?? '') !== 'public') { + $aclFormatter = DI::aclFormatter(); + $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? ''; + $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? ''; + $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? ''; + $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? ''; + } + + $title = Strings::escapeTags(trim($_REQUEST['title'] ?? '')); + $location = Strings::escapeTags(trim($_REQUEST['location'] ?? '')); + $coord = Strings::escapeTags(trim($_REQUEST['coord'] ?? '')); + $verb = Strings::escapeTags(trim($_REQUEST['verb'] ?? '')); + $emailcc = Strings::escapeTags(trim($_REQUEST['emailcc'] ?? '')); + $body = trim($body); + $network = Strings::escapeTags(trim(($_REQUEST['network'] ?? '') ?: Protocol::DFRN)); $guid = System::createUUID(); - $postopts = defaults($_REQUEST, 'postopts', ''); + $postopts = $_REQUEST['postopts'] ?? ''; - $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); + if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) { + $private = Item::PRIVATE; + } elseif (DI::pConfig()->get($profile_uid, 'system', 'unlisted')) { + $private = Item::UNLISTED; + } else { + $private = Item::PUBLIC; + } // If this is a comment, set the permissions from the parent. @@ -295,33 +301,35 @@ function item_post(App $a) { $network = $toplevel_item['network']; } - $str_contact_allow = $toplevel_item['allow_cid']; - $str_group_allow = $toplevel_item['allow_gid']; - $str_contact_deny = $toplevel_item['deny_cid']; - $str_group_deny = $toplevel_item['deny_gid']; + $str_contact_allow = $toplevel_item['allow_cid'] ?? ''; + $str_group_allow = $toplevel_item['allow_gid'] ?? ''; + $str_contact_deny = $toplevel_item['deny_cid'] ?? ''; + $str_group_deny = $toplevel_item['deny_gid'] ?? ''; $private = $toplevel_item['private']; $wall = $toplevel_item['wall']; } - $pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private; + $pubmail_enabled = ($_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) { - if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) { + if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) { $pubmail_enabled = DBA::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']); } } if (!strlen($body)) { if ($preview) { - exit(); + System::jsonExit(['preview' => '']); } - info(L10n::t('Empty post discarded.') . EOL); - if (!empty($_REQUEST['return'])) { - $a->internalRedirect($return_path); + + info(DI::l10n()->t('Empty post discarded.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + + throw new HTTPException\BadRequestException(DI::l10n()->t('Empty post discarded.')); } } @@ -332,7 +340,7 @@ function item_post(App $a) { // save old and new categories, so we can determine what needs to be deleted from pconfig $categories_old = $categories; - $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category'); + $categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category'); $categories_new = $categories; if (!empty($filedas) && is_array($filedas)) { @@ -365,64 +373,53 @@ function item_post(App $a) { } // Look for any tags and linkify them - $str_tags = ''; $inform = ''; - - $tags = BBCode::getTags($body); - - if ($thread_parent_id && !\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions')) { - $tags = item_add_implicit_mentions($tags, $thread_parent_contact, $thread_parent_id); - } - - $tagged = []; - $private_forum = false; + $private_id = null; $only_to_forum = false; $forum_contact = []; - if (count($tags)) { + $body = BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], function ($body) use ($profile_uid, $network, $str_contact_allow, &$inform, &$private_forum, &$private_id, &$only_to_forum, &$forum_contact) { + $tags = BBCode::getTags($body); + + $tagged = []; + foreach ($tags as $tag) { $tag_type = substr($tag, 0, 1); - if ($tag_type == Term::TAG_CHARACTER[Term::HASHTAG]) { + if ($tag_type == Tag::TAG_CHARACTER[Tag::HASHTAG]) { continue; } - /* - * If we already tagged 'Robert Johnson', don't try and tag 'Robert'. + /* If we already tagged 'Robert Johnson', don't try and tag 'Robert'. * 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? foreach ($tagged as $nextTag) { if (stristr($nextTag, $tag . ' ')) { - $fullnametagged = true; - break; + continue 2; } } - if ($fullnametagged) { - continue; - } - $success = handle_tag($body, $inform, $str_tags, local_user() ? local_user() : $profile_uid, $tag, $network); + $success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network); if ($success['replaced']) { $tagged[] = $tag; } // When the forum is private or the forum is addressed with a "!" make the post private - if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]))) { + if (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) { $private_forum = $success['contact']['prv']; - $only_to_forum = ($tag_type == Term::TAG_CHARACTER[Term::EXCLUSIVE_MENTION]); + $only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]); $private_id = $success['contact']['id']; $forum_contact = $success['contact']; - } elseif (is_array($success['contact']) && !empty($success['contact']['forum']) && - ($str_contact_allow == '<' . $success['contact']['id'] . '>')) { + } elseif (!empty($success['contact']['forum']) && ($str_contact_allow == '<' . $success['contact']['id'] . '>')) { $private_forum = false; $only_to_forum = true; $private_id = $success['contact']['id']; $forum_contact = $success['contact']; } } - } + + return $body; + }); $original_contact_id = $contact_id; @@ -456,8 +453,8 @@ function item_post(App $a) { $match = null; - if (!$preview && Photo::setPermissionFromBody($body, $profile_uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) { - $objecttype = ACTIVITY_OBJ_IMAGE; + if (!$preview && Photo::setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) { + $objecttype = Activity\ObjectType::IMAGE; } /* @@ -493,28 +490,24 @@ function item_post(App $a) { if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) && ($posttype != Item::PT_PERSONAL_NOTE)) { $posttype = Item::PT_PAGE; - $objecttype = ACTIVITY_OBJ_BOOKMARK; + $objecttype = Activity\ObjectType::BOOKMARK; } - $body = bb_translate_video($body); - + $body = DI::bbCodeVideo()->transform($body); - // Fold multi-line [code] sequences - $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); - - $body = BBCode::scaleExternalImages($body, false); + $body = BBCode::scaleExternalImages($body); // Setting the object type if not defined before if (!$objecttype) { - $objecttype = ACTIVITY_OBJ_NOTE; // Default value + $objecttype = Activity\ObjectType::NOTE; // Default value $objectdata = BBCode::getAttachedData($body); if ($objectdata["type"] == "link") { - $objecttype = ACTIVITY_OBJ_BOOKMARK; + $objecttype = Activity\ObjectType::BOOKMARK; } elseif ($objectdata["type"] == "video") { - $objecttype = ACTIVITY_OBJ_VIDEO; + $objecttype = Activity\ObjectType::VIDEO; } elseif ($objectdata["type"] == "photo") { - $objecttype = ACTIVITY_OBJ_IMAGE; + $objecttype = Activity\ObjectType::IMAGE; } } @@ -530,7 +523,7 @@ function item_post(App $a) { if (strlen($attachments)) { $attachments .= ','; } - $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $attachment['id'] . + $attachments .= '[attach]href="' . DI::baseUrl() . '/attach/' . $attachment['id'] . '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] . '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]'; } @@ -539,7 +532,7 @@ function item_post(App $a) { } if (!strlen($verb)) { - $verb = ACTIVITY_POST; + $verb = Activity::POST; } if ($network == "") { @@ -592,7 +585,6 @@ function item_post(App $a) { $datarray['app'] = $app; $datarray['location'] = $location; $datarray['coord'] = $coord; - $datarray['tag'] = $str_tags; $datarray['file'] = $categories; $datarray['inform'] = $inform; $datarray['verb'] = $verb; @@ -641,12 +633,15 @@ function item_post(App $a) { if ($orig_post) { $datarray['edit'] = true; } else { + // If this was a share, add missing data here + $datarray = Item::addShareDataFromOriginal($datarray); + $datarray['edit'] = false; } // Check for hashtags in the body and repair or add hashtag links if ($preview || $orig_post) { - Item::setHashtags($datarray); + $datarray['body'] = Item::setHashtags($datarray['body']); } // preview mode - prepare the body for display and send it via json @@ -654,30 +649,29 @@ function item_post(App $a) { // We set the datarray ID to -1 because in preview mode the dataray // doesn't have an ID. $datarray["id"] = -1; + $datarray["uri-id"] = -1; $datarray["item_id"] = -1; $datarray["author-network"] = Protocol::DFRN; - $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager($a->query_string), 'search', false, true); - Logger::log('preview: ' . $o); - echo json_encode(['preview' => $o]); - exit(); + $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true); + + System::jsonExit(['preview' => $o]); } Hook::callAll('post_local',$datarray); if (!empty($datarray['cancel'])) { - Logger::log('mod_item: post cancelled by addon.'); + Logger::info('mod_item: post cancelled by addon.'); if ($return_path) { - $a->internalRedirect($return_path); + DI::baseUrl()->redirect($return_path); } $json = ['cancel' => 1]; if (!empty($_REQUEST['jsreload'])) { - $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload']; + $json['reload'] = DI::baseUrl() . '/' . $_REQUEST['jsreload']; } - echo json_encode($json); - exit(); + System::jsonExit($json); } if ($orig_post) { @@ -688,7 +682,6 @@ function item_post(App $a) { $fields = [ 'title' => $datarray['title'], 'body' => $datarray['body'], - 'tag' => $datarray['tag'], 'attach' => $datarray['attach'], 'file' => $datarray['file'], 'rendered-html' => $datarray['rendered-html'], @@ -701,11 +694,12 @@ function item_post(App $a) { // update filetags in pconfig FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category'); - if (!empty($_REQUEST['return']) && strlen($return_path)) { - Logger::log('return: ' . $return_path); - $a->internalRedirect($return_path); + info(DI::l10n()->t('Post updated.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); } - exit(); + + throw new HTTPException\OKException(DI::l10n()->t('Post updated.')); } unset($datarray['edit']); @@ -722,15 +716,29 @@ function item_post(App $a) { $post_id = Item::insert($datarray); if (!$post_id) { - Logger::log("Item wasn't stored."); - $a->internalRedirect($return_path); + info(DI::l10n()->t('Item wasn\'t stored.')); + if ($return_path) { + DI::baseUrl()->redirect($return_path); + } + + throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item wasn\'t stored.')); } $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); if (!DBA::isResult($datarray)) { - Logger::log("Item with id ".$post_id." couldn't be fetched."); - $a->internalRedirect($return_path); + Logger::error('Item couldn\'t be fetched.', ['post_id' => $post_id]); + if ($return_path) { + DI::baseUrl()->redirect($return_path); + } + + throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.')); + } + + Tag::storeFromBody($datarray['uri-id'], $datarray['body']); + + if (!\Friendica\Content\Feature::isEnabled($uid, 'explicit_mentions') && ($datarray['gravity'] == GRAVITY_COMMENT)) { + Tag::createImplicitMentions($datarray['uri-id'], $datarray['thr-parent-id']); } // update filetags in pconfig @@ -740,18 +748,18 @@ function item_post(App $a) { if ($toplevel_item_id) { if ($contact_record != $author) { notification([ - 'type' => NOTIFY_COMMENT, + 'type' => Type::COMMENT, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, + 'verb' => Activity::POST, 'otype' => 'item', 'parent' => $toplevel_item_id, 'parent_uri' => $toplevel_item['uri'] @@ -760,18 +768,18 @@ function item_post(App $a) { } else { if (($contact_record != $author) && !count($forum_contact)) { notification([ - 'type' => NOTIFY_WALL, + 'type' => Type::WALL, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, + 'verb' => Activity::POST, 'otype' => 'item' ]); } @@ -780,35 +788,15 @@ function item_post(App $a) { Hook::callAll('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)) { + $recipients = explode(',', $emailcc); + if (count($recipients)) { + foreach ($recipients as $recipient) { + $address = trim($recipient); + if (!strlen($address)) { continue; } - $disclaimer = '