X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=99251a4a47dfaf11b7bfa38be49b78b434c0bbf9;hb=a16dba2941bb3507faa84a13df2001a61daa3e96;hp=a9c5d43580794d660e7fa2a83099c994bd36c6a4;hpb=ed9392469e7327639cc2d21870ad0ccacb3cda4d;p=friendica.git diff --git a/mod/item.php b/mod/item.php index a9c5d43580..99251a4a47 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 @@ -18,7 +31,6 @@ use Friendica\App; use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; -use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; @@ -32,13 +44,14 @@ 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\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,7 +60,7 @@ require_once __DIR__ . '/../include/items.php'; function item_post(App $a) { if (!Session::isAuthenticated()) { - return 0; + throw new HTTPException\ForbiddenException(); } $uid = local_user(); @@ -56,13 +69,12 @@ function item_post(App $a) { $arr_drop = explode(',', $_REQUEST['dropitems']); drop_items($arr_drop); $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 = $_REQUEST['api_source'] ?? false; @@ -78,7 +90,7 @@ 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); + Logger::info('item post: duplicate post'); item_post_return(DI::baseUrl(), $api_source, $return_path); } else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; @@ -116,16 +128,16 @@ function item_post(App $a) { $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']]); + $toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]); } } if (!DBA::isResult($toplevel_item)) { - notice(DI::l10n()->t('Unable to locate original post.') . EOL); - if (!empty($_REQUEST['return'])) { + 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']; @@ -135,7 +147,7 @@ function item_post(App $a) { } 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($_REQUEST['post_id'] ?? 0); @@ -158,7 +170,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 +180,12 @@ function item_post(App $a) { // Now check that valid personal details have been provided if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { - notice(DI::l10n()->t('Permission denied.') . EOL); - - if (!empty($_REQUEST['return'])) { + 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 @@ -250,33 +261,13 @@ function item_post(App $a) { $network = $orig_post['network']; $guid = $orig_post['guid']; $extid = $orig_post['extid']; - } else { + $aclFormatter = DI::aclFormatter(); - /* - * 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 - - $aclFormatter = DI::aclFormatter(); - - $str_group_allow = $aclFormatter->toString($_REQUEST['group_allow'] ?? ''); - $str_contact_allow = $aclFormatter->toString($_REQUEST['contact_allow'] ?? ''); - $str_group_deny = $aclFormatter->toString($_REQUEST['group_deny'] ?? ''); - $str_contact_deny = $aclFormatter->toString($_REQUEST['contact_deny'] ?? ''); - } + $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? ''; + $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact__allow']) : $user['allow_cid'] ?? ''; + $str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? ''; + $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? ''; $title = Strings::escapeTags(trim($_REQUEST['title'] ?? '')); $location = Strings::escapeTags(trim($_REQUEST['location'] ?? '')); @@ -289,7 +280,13 @@ function item_post(App $a) { $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. @@ -301,10 +298,10 @@ 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']; @@ -321,13 +318,15 @@ function item_post(App $a) { if (!strlen($body)) { if ($preview) { - exit(); + System::jsonExit(['preview' => '']); } - info(DI::l10n()->t('Empty post discarded.') . EOL); - if (!empty($_REQUEST['return'])) { + + 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.')); } } @@ -504,9 +503,6 @@ function item_post(App $a) { $body = DI::bbCodeVideo()->transform($body); - // Fold multi-line [code] sequences - $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); - $body = BBCode::scaleExternalImages($body); // Setting the object type if not defined before @@ -665,16 +661,15 @@ function item_post(App $a) { $datarray["item_id"] = -1; $datarray["author-network"] = Protocol::DFRN; - $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager(DI::args()->getQueryString()), '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) { DI::baseUrl()->redirect($return_path); } @@ -684,8 +679,7 @@ function item_post(App $a) { $json['reload'] = DI::baseUrl() . '/' . $_REQUEST['jsreload']; } - echo json_encode($json); - exit(); + System::jsonExit($json); } if ($orig_post) { @@ -709,11 +703,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); + 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']); @@ -730,15 +725,23 @@ function item_post(App $a) { $post_id = Item::insert($datarray); if (!$post_id) { - Logger::log("Item wasn't stored."); - DI::baseUrl()->redirect($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."); - DI::baseUrl()->redirect($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.')); } // update filetags in pconfig @@ -748,7 +751,7 @@ 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'], @@ -768,7 +771,7 @@ 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'], @@ -788,35 +791,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 = '