X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FItem.php;h=25d27b26df7b0228e88681d4d0a627d87812f213;hb=d402e666440248fbf139dcbde268609407666c7f;hp=26df55fd064e32785812939e73374e00ab5387a5;hpb=50e43c530e019bce5defda2a4503a9a817d8772f;p=friendica.git

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 26df55fd06..25d27b26df 100644
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -223,15 +223,13 @@ class Item
 
 				// select someone by nick in the current network
 				if (!DBA::isResult($contact) && ($network != '')) {
-					$condition = ["`nick` = ? AND `network` = ? AND `uid` = ?",
-						$name, $network, $profile_uid];
+					$condition = ['nick' => $name, 'network' => $network, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
 				// select someone by attag in the current network
 				if (!DBA::isResult($contact) && ($network != '')) {
-					$condition = ["`attag` = ? AND `network` = ? AND `uid` = ?",
-						$name, $network, $profile_uid];
+					$condition = ['attag' => $name, 'network' => $network, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
@@ -243,13 +241,13 @@ class Item
 
 				// select someone by nick in any network
 				if (!DBA::isResult($contact)) {
-					$condition = ["`nick` = ? AND `uid` = ?", $name, $profile_uid];
+					$condition = ['nick' => $name, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
 				// select someone by attag in any network
 				if (!DBA::isResult($contact)) {
-					$condition = ["`attag` = ? AND `uid` = ?", $name, $profile_uid];
+					$condition = ['attag' => $name, 'uid' => $profile_uid];
 					$contact = DBA::selectFirst('contact', $fields, $condition);
 				}
 
@@ -271,7 +269,7 @@ class Item
 				$replaced = true;
 				// create profile link
 				$profile = str_replace(',', '%2c', $profile);
-				$newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
+				$newtag = $tag_type . '[url=' . $profile . ']' . $newname . '[/url]';
 				$body = str_replace($tag_type . $name, $newtag, $body);
 			}
 		}
@@ -295,8 +293,10 @@ class Item
 			$xmlhead = '<?xml version="1.0" encoding="UTF-8" ?>';
 
 			if ($this->activity->match($item['verb'], Activity::TAG)) {
-				$fields = ['author-id', 'author-link', 'author-name', 'author-network',
-					'verb', 'object-type', 'resource-id', 'body', 'plink'];
+				$fields = [
+					'author-id', 'author-link', 'author-name', 'author-network',
+					'verb', 'object-type', 'resource-id', 'body', 'plink'
+				];
 				$obj = Post::selectFirst($fields, ['uri' => $item['parent-uri']]);
 				if (!DBA::isResult($obj)) {
 					$this->profiler->stopRecording();
@@ -333,8 +333,8 @@ class Item
 					default:
 						if ($obj['resource-id']) {
 							$post_type = $this->l10n->t('photo');
-							$m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
-							$rr['plink'] = $m[1];
+							preg_match("/\[url=([^]]*)\]/", $obj['body'], $matches);
+							$rr['plink'] = $matches[1];
 						} else {
 							$post_type = $this->l10n->t('status');
 						}
@@ -433,7 +433,8 @@ class Item
 			}
 
 			if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
-				in_array($item['network'], Protocol::FEDERATED)) {
+				in_array($item['network'], Protocol::FEDERATED)
+			) {
 				$menu[$this->l10n->t('Connect/Follow')] = 'contact/follow?url=' . urlencode($item['author-link']) . '&auto=1';
 			}
 		} else {
@@ -859,7 +860,7 @@ class Item
 
 		$user = User::getById($post['uid'], ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
 		if (!$user) {
-			throw new HTTPException\NotFoundException($this->l10n->t('Unable to locate original post.'));
+			throw new HTTPException\NotFoundException($this->l10n->t('Unable to fetch user.'));
 		}
 
 		$post['allow_cid'] = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $user['allow_cid'] ?? '';
@@ -891,7 +892,7 @@ class Item
 
 	public function moveAttachmentsFromBodyToAttach(array $post): array
 	{
-		if (!preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$post['body'], $match)) {
+		if (!preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/', $post['body'], $match)) {
 			return $post;
 		}
 
@@ -903,11 +904,17 @@ class Item
 			if ($post['attach']) {
 				$post['attach'] .= ',';
 			}
-			$post['attach'] .= Post\Media::getAttachElement($this->baseURL->get() . '/attach/' . $attachment['id'],
-				$attachment['filesize'], $attachment['filetype'], $attachment['filename'] ?? '');
-
-			$fields = ['allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'],
-					'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']];
+			$post['attach'] .= Post\Media::getAttachElement(
+				$this->baseURL . '/attach/' . $attachment['id'],
+				$attachment['filesize'],
+				$attachment['filetype'],
+				$attachment['filename'] ?? ''
+			);
+
+			$fields = [
+				'allow_cid' => $post['allow_cid'], 'allow_gid' => $post['allow_gid'],
+				'deny_cid' => $post['deny_cid'], 'deny_gid' => $post['deny_gid']
+			];
 			$condition = ['id' => $attachment_id];
 			Attach::update($fields, $condition);
 		}
@@ -925,8 +932,9 @@ class Item
 
 		// embedded bookmark or attachment in post? set bookmark flag
 		$data = BBCode::getAttachmentData($post['body']);
-		if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || isset($data['type']))
-			&& ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)) {
+		if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $post['body'], $match, PREG_SET_ORDER) || !empty($data['type']))
+			&& ($post['post-type'] != ItemModel::PT_PERSONAL_NOTE)
+		) {
 			$post['post-type'] = ItemModel::PT_PAGE;
 			$post['object-type'] = Activity\ObjectType::BOOKMARK;
 		}
@@ -934,33 +942,44 @@ class Item
 		// Setting the object type if not defined before
 		if (empty($post['object-type'])) {
 			$post['object-type'] = ($post['gravity'] == ItemModel::GRAVITY_PARENT) ? Activity\ObjectType::NOTE : Activity\ObjectType::COMMENT;
-
-			$objectdata = BBCode::getAttachedData($post['body']);
-
-			if ($objectdata['type'] == 'link') {
-				$post['object-type'] = Activity\ObjectType::BOOKMARK;
-			} elseif ($objectdata['type'] == 'video') {
-				$post['object-type'] = Activity\ObjectType::VIDEO;
-			} elseif ($objectdata['type'] == 'photo') {
-				$post['object-type'] = Activity\ObjectType::IMAGE;
-			}
 		}
 		return $post;
 	}
 
 	public function initializePost(array $post): array
 	{
-		$post['network']   = Protocol::DFRN;
-		$post['protocol']  = Conversation::PARCEL_DIRECT;
-		$post['direction'] = Conversation::PUSH;
-		$post['received']  = DateTimeFormat::utcNow();
-		$post['origin']    = true;
-		$post['wall']      = $post['wall'] ?? true;
-		$post['guid']      = $post['guid'] ?? System::createUUID();
-		$post['uri']       = $post['uri']  ?? ItemModel::newURI($post['guid']);
-		$post['verb']      = $post['verb'] ?? Activity::POST;
+		$post['network']    = Protocol::DFRN;
+		$post['protocol']   = Conversation::PARCEL_DIRECT;
+		$post['direction']  = Conversation::PUSH;
+		$post['received']   = DateTimeFormat::utcNow();
+		$post['origin']     = true;
+		$post['wall']       = $post['wall'] ?? true;
+		$post['guid']       = $post['guid'] ?? System::createUUID();
+		$post['verb']       = $post['verb'] ?? Activity::POST;
+		$post['uri']        = $post['uri'] ?? ItemModel::newURI($post['guid']);
+		$post['thr-parent'] = $post['thr-parent'] ?? $post['uri'];
+
+		if (empty($post['gravity'])) {
+			$post['gravity'] = ($post['uri'] == $post['thr-parent']) ? ItemModel::GRAVITY_PARENT : ItemModel::GRAVITY_COMMENT;
+		}
+
 		$owner = User::getOwnerDataById($post['uid']);
 
+		if (!isset($post['allow_cid']) || !isset($post['allow_gid']) || !isset($post['deny_cid']) || !isset($post['deny_gid'])) {
+			$post['allow_cid'] = $owner['allow_cid'];
+			$post['allow_gid'] = $owner['allow_gid'];
+			$post['deny_cid']  = $owner['deny_cid'];
+			$post['deny_gid']  = $owner['deny_gid'];
+		}
+
+		if ($post['allow_gid'] || $post['allow_cid'] || $post['deny_gid'] || $post['deny_cid']) {
+			$post['private'] = ItemModel::PRIVATE;
+		} elseif ($this->pConfig->get($post['uid'], 'system', 'unlisted')) {
+			$post['private'] = ItemModel::UNLISTED;
+		} else {
+			$post['private'] = ItemModel::PUBLIC;
+		}
+
 		if (empty($post['contact-id'])) {
 			$post['contact-id'] = $owner['id'];
 		}
@@ -991,7 +1010,6 @@ class Item
 		// Convert links with empty descriptions to links without an explicit description
 		$post['body'] = trim(preg_replace('#\[url=([^\]]*?)\]\[/url\]#ism', '[url]$1[/url]', $post['body']));
 		$post['body'] = $this->bbCodeVideo->transform($post['body']);
-		$post['body'] = BBCode::scaleExternalImages($post['body']);
 		$post = $this->setObjectType($post);
 
 		// Personal notes must never be altered to a forum post.
@@ -1019,8 +1037,14 @@ class Item
 				continue;
 			}
 
-			$this->emailer->send(new ItemCCEMail($this->app, $this->l10n, $this->baseURL,
-				$post, $address, $author['thumb'] ?? ''));
+			$this->emailer->send(new ItemCCEMail(
+				$this->app,
+				$this->l10n,
+				$this->baseURL,
+				$post,
+				$address,
+				$author['thumb'] ?? ''
+			));
 		}
 	}
 }