X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=c6f359cf4824bf3c3a52e19e3afba9431c7b4463;hb=0e01568ccd5b5ce081eff83e2ed0b888e0b6db55;hp=733c6aee85306c8e78b4bcb23cec661e326a015d;hpb=a8b74e6bc7f42da22297d91195f032b1f82196bc;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 733c6aee85..c6f359cf48 100644 --- a/mod/item.php +++ b/mod/item.php @@ -16,22 +16,27 @@ */ use Friendica\App; +use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Conversation; +use Friendica\Model\FileTag; use Friendica\Model\Item; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; use Friendica\Util\DateTimeFormat; use Friendica\Util\Emailer; +use Friendica\Util\Security; +use Friendica\Util\Strings; require_once 'include/enotify.php'; require_once 'include/text.php'; @@ -39,11 +44,9 @@ require_once 'include/items.php'; function item_post(App $a) { if (!local_user() && !remote_user()) { - return; + return 0; } - require_once 'include/security.php'; - $uid = local_user(); if (!empty($_REQUEST['dropitems'])) { @@ -56,7 +59,7 @@ function item_post(App $a) { Addon::callHooks('post_local_start', $_REQUEST); - logger('postvars ' . print_r($_REQUEST, true), LOGGER_DATA); + Logger::log('postvars ' . print_r($_REQUEST, true), Logger::DATA); $api_source = defaults($_REQUEST, 'api_source', false); @@ -72,7 +75,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("item post: duplicate post", LOGGER_DEBUG); + Logger::log("item post: duplicate post", Logger::DEBUG); item_post_return(System::baseUrl(), $api_source, $return_path); } else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; @@ -116,7 +119,7 @@ function item_post(App $a) { if (!DBA::isResult($parent_item)) { notice(L10n::t('Unable to locate original post.') . EOL); if (!empty($_REQUEST['return'])) { - goaway($return_path); + $a->internalRedirect($return_path); } killme(); } @@ -130,7 +133,7 @@ function item_post(App $a) { } if ($parent) { - logger('mod_item: item_post parent=' . $parent); + Logger::log('mod_item: item_post parent=' . $parent); } $post_id = intval(defaults($_REQUEST, 'post_id', 0)); @@ -153,20 +156,20 @@ 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("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG); - return; + Logger::log("Message with URI ".$message_id." already exists for user ".$profile_uid, Logger::DEBUG); + return 0; } } // Allow commenting if it is an answer to a public post - $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]); + $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]); // Now check that valid personal details have been provided - if (!can_write_wall($profile_uid) && !$allow_comment) { + if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) { notice(L10n::t('Permission denied.') . EOL) ; if (!empty($_REQUEST['return'])) { - goaway($return_path); + $a->internalRedirect($return_path); } killme(); @@ -183,7 +186,7 @@ function item_post(App $a) { $user = DBA::selectFirst('user', [], ['uid' => $profile_uid]); if (!DBA::isResult($user) && !$parent) { - return; + return 0; } $categories = ''; @@ -201,8 +204,8 @@ function item_post(App $a) { $objecttype = $orig_post['object-type']; $app = $orig_post['app']; $categories = $orig_post['file']; - $title = notags(trim($_REQUEST['title'])); - $body = escape_tags(trim($_REQUEST['body'])); + $title = Strings::removeTags(trim($_REQUEST['title'])); + $body = Strings::escapeTags(trim($_REQUEST['body'])); $private = $orig_post['private']; $pubmail_enabled = $orig_post['pubmail']; $network = $orig_post['network']; @@ -233,14 +236,14 @@ function item_post(App $a) { $str_contact_deny = perms2str(defaults($_REQUEST, 'contact_deny', '')); } - $title = notags(trim(defaults($_REQUEST, 'title' , ''))); - $location = notags(trim(defaults($_REQUEST, 'location', ''))); - $coord = notags(trim(defaults($_REQUEST, 'coord' , ''))); - $verb = notags(trim(defaults($_REQUEST, 'verb' , ''))); - $emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , ''))); - $body = escape_tags(trim(defaults($_REQUEST, 'body' , ''))); - $network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN))); - $guid = System::createGUID(32); + $title = Strings::removeTags(trim(defaults($_REQUEST, 'title' , ''))); + $location = Strings::removeTags(trim(defaults($_REQUEST, 'location', ''))); + $coord = Strings::removeTags(trim(defaults($_REQUEST, 'coord' , ''))); + $verb = Strings::removeTags(trim(defaults($_REQUEST, 'verb' , ''))); + $emailcc = Strings::removeTags(trim(defaults($_REQUEST, 'emailcc' , ''))); + $body = Strings::escapeTags(trim(defaults($_REQUEST, 'body' , ''))); + $network = Strings::removeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN))); + $guid = System::createUUID(); $postopts = defaults($_REQUEST, 'postopts', ''); @@ -284,23 +287,27 @@ function item_post(App $a) { } info(L10n::t('Empty post discarded.') . EOL); if (!empty($_REQUEST['return'])) { - goaway($return_path); + $a->internalRedirect($return_path); } killme(); } } - if (!empty($categories)) { + if (!empty($categories)) + { // get the "fileas" tags for this post - $filedas = file_tag_file_to_list($categories, 'file'); + $filedas = FileTag::fileToList($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(defaults($_REQUEST, 'category', '')), 'category'); + $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category'); $categories_new = $categories; - if (!empty($filedas)) { + + if (!empty($filedas)) + { // append the fileas stuff to the new categories list - $categories .= file_tag_list_to_file($filedas, 'file'); + $categories .= FileTag::listToFile($filedas, 'file'); } // get contact info for poster @@ -343,20 +350,11 @@ function item_post(App $a) { $tags = get_tags($body); - // Add a tag if the parent contact is from OStatus (This will notify them during delivery) - if ($parent) { - if ($thr_parent_contact['network'] == Protocol::OSTATUS) { - $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]'; - if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) { - $tags[] = $contact; - } - } - - if ($parent_contact['network'] == Protocol::OSTATUS) { - $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; - if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) { - $tags[] = $contact; - } + // Add a tag if the parent contact is from ActivityPub or OStatus (This will notify them) + if ($parent && in_array($thr_parent_contact['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) { + $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]'; + if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) { + $tags[] = $contact; } } @@ -677,18 +675,18 @@ function item_post(App $a) { $datarray["item_id"] = -1; $datarray["author-network"] = Protocol::DFRN; - $o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true); - logger('preview: ' . $o); + $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]); - killme(); + exit(); } Addon::callHooks('post_local',$datarray); if (!empty($datarray['cancel'])) { - logger('mod_item: post cancelled by addon.'); + Logger::log('mod_item: post cancelled by addon.'); if ($return_path) { - goaway($return_path); + $a->internalRedirect($return_path); } $json = ['cancel' => 1]; @@ -700,11 +698,10 @@ function item_post(App $a) { killme(); } - if ($orig_post) { - + if ($orig_post) { // 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); + Item::putInCache($datarray); $fields = [ 'title' => $datarray['title'], @@ -720,11 +717,11 @@ function item_post(App $a) { Item::update($fields, ['id' => $post_id]); // update filetags in pconfig - file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); + FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category'); if (!empty($_REQUEST['return']) && strlen($return_path)) { - logger('return: ' . $return_path); - goaway($return_path); + Logger::log('return: ' . $return_path); + $a->internalRedirect($return_path); } killme(); } else { @@ -735,22 +732,29 @@ function item_post(App $a) { unset($datarray['self']); unset($datarray['api_source']); + if ($origin) { + $signed = Diaspora::createCommentSignature($uid, $datarray); + if (!empty($signed)) { + $datarray['diaspora_signed_text'] = json_encode($signed); + } + } + $post_id = Item::insert($datarray); if (!$post_id) { - logger("Item wasn't stored."); - goaway($return_path); + Logger::log("Item wasn't stored."); + $a->internalRedirect($return_path); } $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); if (!DBA::isResult($datarray)) { - logger("Item with id ".$post_id." couldn't be fetched."); - goaway($return_path); + Logger::log("Item with id ".$post_id." couldn't be fetched."); + $a->internalRedirect($return_path); } // update filetags in pconfig - file_tag_update_pconfig($uid, $categories_old, $categories_new, 'category'); + FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category'); // These notifications are sent if someone else is commenting other your wall if ($parent) { @@ -773,9 +777,6 @@ function item_post(App $a) { '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 { if (($contact_record != $author) && !count($forum_contact)) { notification([ @@ -816,7 +817,7 @@ function item_post(App $a) { $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8'); } $link = '' . $a->user['username'] . '

'; - $html = prepare_body($datarray); + $html = Item::prepareBody($datarray); $message = '' . $link . $html . $disclaimer . ''; $params = [ 'fromName' => $a->user['username'], @@ -838,10 +839,17 @@ function item_post(App $a) { // We don't fork a new process since this is done anyway with the following command 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); + // When we are doing some forum posting via ! we have to start the notifier manually. + // These kind of posts don't initiate the notifier call in the item class. + if ($only_to_forum) { + Worker::add(PRIORITY_HIGH, "Notifier", $notify_type, $post_id); + } - logger('post_complete'); + Logger::log('post_complete'); + + if ($api_source) { + return $post_id; + } item_post_return(System::baseUrl(), $api_source, $return_path); // NOTREACHED @@ -850,13 +858,14 @@ function item_post(App $a) { function item_post_return($baseurl, $api_source, $return_path) { // figure out how to return, depending on from whence we came + $a = get_app(); if ($api_source) { return; } if ($return_path) { - goaway($return_path); + $a->internalRedirect($return_path); } $json = ['success' => 1]; @@ -864,7 +873,7 @@ function item_post_return($baseurl, $api_source, $return_path) $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; } - logger('post_json: ' . print_r($json, true), LOGGER_DEBUG); + Logger::log('post_json: ' . print_r($json, true), Logger::DEBUG); echo json_encode($json); killme(); @@ -876,18 +885,21 @@ function item_content(App $a) return; } - require_once 'include/security.php'; - $o = ''; - if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { - if (is_ajax()) { + if (($a->argc >= 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { + if ($a->isAjax()) { $o = Item::deleteForUser(['id' => $a->argv[2]], local_user()); } else { - $o = drop_item($a->argv[2]); + if (!empty($a->argv[3])) { + $o = drop_item($a->argv[2], $a->argv[3]); + } + else { + $o = drop_item($a->argv[2]); + } } - if (is_ajax()) { + if ($a->isAjax()) { // ajax return: [, 0 (no perm) | ] echo json_encode([intval($a->argv[2]), intval($o)]); killme(); @@ -1020,12 +1032,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n $profile = $contact["url"]; $alias = $contact["alias"]; - $newname = $contact["nick"]; - - if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER) - && ($contact["network"] != Protocol::STATUSNET))) { - $newname = $contact["name"]; - } + $newname = defaults($contact, "name", $contact["nick"]); } //if there is an url for this persons profile