X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=bfb865b790553d3ee293acfc40f117a4beba0652;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=56f27a9543ab8d1aa0106a77330910b5a5e50de4;hpb=e4553ad156d2846a85503186740a81de88be8a86;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 56f27a9543..bfb865b790 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -40,6 +40,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\APContact;
 use Friendica\Model\Attach;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
@@ -54,7 +55,6 @@ use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Object\EMail\ItemCCEMail;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
 use Friendica\Security\Security;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\ParseUrl;
@@ -177,10 +177,11 @@ function item_post(App $a) {
 	}
 
 	// Allow commenting if it is an answer to a public post
-	$allow_comment = local_user() && ($profile_uid == 0) && $toplevel_item_id && in_array($toplevel_item['network'], Protocol::FEDERATED);
+	$allow_comment = local_user() && $toplevel_item_id && in_array($toplevel_item['private'], [Item::PUBLIC, Item::UNLISTED]) && in_array($toplevel_item['network'], Protocol::FEDERATED);
 
 	// Now check that valid personal details have been provided
 	if (!Security::canWriteToUserWall($profile_uid) && !$allow_comment) {
+		Logger::notice('Permission denied.', ['local' => local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]);
 		notice(DI::l10n()->t('Permission denied.'));
 		if ($return_path) {
 			DI::baseUrl()->redirect($return_path);
@@ -436,20 +437,33 @@ function item_post(App $a) {
 
 	if (!$toplevel_item_id && !empty($forum_contact) && ($private_forum || $only_to_forum)) {
 		// we tagged a forum in a top level post. Now we change the post
-		$private = $private_forum;
+		$private = $private_forum ? Item::PRIVATE : Item::UNLISTED;
 
-		$str_group_allow = '';
-		$str_contact_deny = '';
-		$str_group_deny = '';
-		if ($private_forum) {
-			$str_contact_allow = '<' . $private_id . '>';
-		} else {
+		if ($only_to_forum) {
+			$postopts = '';
+		}
+
+		if (!$private_forum) {
 			$str_contact_allow = '';
+			$str_group_allow   = '';
+			$str_contact_deny  = '';
+			$str_group_deny    = '';
+		}
+
+		if ($private_forum || !APContact::getByURL($forum_contact['url'])) {
+			$str_group_allow = '';
+			$str_contact_deny = '';
+			$str_group_deny = '';
+			if ($private_forum) {
+				$str_contact_allow = '<' . $private_id . '>';
+			} else {
+				$str_contact_allow = '';
+			}
+			$contact_id = $private_id;
+			$contact_record = $forum_contact;
+			$_REQUEST['origin'] = false;
+			$wall = 0;
 		}
-		$contact_id = $private_id;
-		$contact_record = $forum_contact;
-		$_REQUEST['origin'] = false;
-		$wall = 0;
 	}
 
 	/*
@@ -615,7 +629,6 @@ function item_post(App $a) {
 	$datarray['origin']        = $origin;
 	$datarray['object']        = $object;
 
-	$datarray['uri-id']        = ItemURI::getIdByURI($datarray['uri']);
 	$datarray['attachments']   = $_REQUEST['attachments'] ?? [];
 
 	/*
@@ -665,13 +678,30 @@ function item_post(App $a) {
 		$datarray["uri-id"] = -1;
 		$datarray["author-network"] = Protocol::DFRN;
 
-		$o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true);
+		$o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true);
 
 		System::jsonExit(['preview' => $o]);
 	}
 
 	Hook::callAll('post_local',$datarray);
 
+	if (!empty($_REQUEST['scheduled_at'])) {
+		$scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimeZone());
+		if ($scheduled_at > DateTimeFormat::utcNow()) {
+			unset($datarray['created']);
+			unset($datarray['edited']);
+			unset($datarray['commented']);
+			unset($datarray['received']);
+			unset($datarray['changed']);
+			unset($datarray['edit']);
+			unset($datarray['self']);
+			unset($datarray['api_source']);
+
+			Post\Delayed::add($datarray['uri'], $datarray, PRIORITY_HIGH, Post\Delayed::PREPARED_NO_HOOK, $scheduled_at);
+			item_post_return(DI::baseUrl(), $api_source, $return_path);
+		}
+	}
+
 	if (!empty($datarray['cancel'])) {
 		Logger::info('mod_item: post cancelled by addon.');
 		if ($return_path) {
@@ -686,6 +716,8 @@ function item_post(App $a) {
 		System::jsonExit($json);
 	}
 
+	$datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']);
+
 	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.
@@ -900,6 +932,7 @@ function drop_item(int $id, string $return = '')
 
 		item_redirect_after_action($item, $return);
 	} else {
+		Logger::notice('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]);
 		notice(DI::l10n()->t('Permission denied.'));
 		DI::baseUrl()->redirect('display/' . $item['guid']);
 		//NOTREACHED