And some more notices removed ... (#5533)

* Fix for vanishing notes

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

* And some more notes ...

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 7a5442311fef34c9716d14efe0f8d5c121de1a13..3309a74b9f0d22041a9e529924e96f3c94f28343 100644 (file)
--- 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 bc76692fbea399092d209d2dcfaa09c618c364ae..c747f902362db950bb11ac1908f5c882b55ab0a3 100644 (file)
--- 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 532151519adaeb59678dd364a70f439cb4d9a1e8..f02ddb5968bf3ef92052a91f04e0d6c3c4544bf0 100644 (file)
--- 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 486946af34dac69642a07661b05479b9c1b48dcb..a938969b5988d02faf507d3bb7206bb4498106b0 100644 (file)
--- 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