From b552b711eee382df5d3fb8b312dab4d45844025a Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 31 Jul 2018 07:54:25 +0200
Subject: [PATCH] And some more notices removed ... (#5533)

* Fix for vanishing notes

* The field needs to be part of the selected fields ...

* And some more notes ...
---
 mod/parse_url.php        | 12 ++++++------
 src/Protocol/DFRN.php    |  4 ++++
 src/Protocol/OStatus.php |  4 ++++
 src/Worker/Delivery.php  | 12 +++++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 7a5442311f..3309a74b9f 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -24,21 +24,21 @@ function parse_url_content(App $a) {
 
 	$br = "\n";
 
-	if (x($_GET,"binurl")) {
+	if (!empty($_GET["binurl"])) {
 		$url = trim(hex2bin($_GET["binurl"]));
 	} else {
 		$url = trim($_GET["url"]);
 	}
 
-	if ($_GET["title"]) {
+	if (!empty($_GET["title"])) {
 		$title = strip_tags(trim($_GET["title"]));
 	}
 
-	if ($_GET["description"]) {
+	if (!empty($_GET["description"])) {
 		$text = strip_tags(trim($_GET["description"]));
 	}
 
-	if ($_GET["tags"]) {
+	if (!empty($_GET["tags"])) {
 		$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
 		if (count($arr_tags)) {
 			$str_tags = $br . implode(" ", $arr_tags) . $br;
@@ -103,9 +103,9 @@ function parse_url_content(App $a) {
 		killme();
 	}
 
-	// If there is allready some content information submitted we don't
+	// If there is already some content information submitted we don't
 	// need to parse the url for content.
-	if ($url && $title && $text) {
+	if (!empty($url) && !empty($title) && !empty($text)) {
 
 		$title = str_replace(["\r","\n"],["",""],$title);
 
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index bc76692fbe..c747f90236 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2422,13 +2422,17 @@ class DFRN
 
 		$owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
 
+		$item["owner-name"] = $owner["name"];
 		$item["owner-link"] = $owner["link"];
+		$item["owner-avatar"] = $owner["avatar"];
 		$item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
 
 		// fetch the author
 		$author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true);
 
+		$item["author-name"] = $author["name"];
 		$item["author-link"] = $author["link"];
+		$item["author-avatar"] = $author["avatar"];
 		$item["author-id"] = Contact::getIdForURL($author["link"], 0);
 
 		$item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 532151519a..f02ddb5968 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -350,6 +350,10 @@ class OStatus
 		$header["origin"] = 0;
 		$header["gravity"] = GRAVITY_COMMENT;
 
+		if (!is_object($doc->firstChild)) {
+			return false;
+		}
+
 		$first_child = $doc->firstChild->tagName;
 
 		if ($first_child == "feed") {
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 486946af34..a938969b59 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -59,7 +59,7 @@ class Delivery extends BaseObject
 			}
 			$parent_id = intval($item['parent']);
 
-			$condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false];
+			$condition = ['id' => [$item_id, $parent_id], 'moderated' => false];
 			$params = ['order' => ['id']];
 			$itemdata = Item::select([], $condition, $params);
 
@@ -75,6 +75,16 @@ class Delivery extends BaseObject
 			}
 			DBA::close($itemdata);
 
+			if (empty($target_item)) {
+				logger('Item ' . $item_id . "wasn't found. Quitting here.");
+				return;
+			}
+
+			if (empty($parent)) {
+				logger('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
+				return;
+			}
+
 			$uid = $target_item['contact-uid'];
 
 			// avoid race condition with deleting entries