', $data["url"], self::proxyUrl($data["image"], $simplehtml), $data["title"]); - } elseif ($data["preview"] != "") { + } elseif (!empty($data["preview"])) { $return .= sprintf('
', $data["url"], self::proxyUrl($data["preview"], $simplehtml), $data["title"]); } diff --git a/src/Core/L10n.php b/src/Core/L10n.php index 277b3401d..24be01095 100644 --- a/src/Core/L10n.php +++ b/src/Core/L10n.php @@ -144,6 +144,10 @@ class L10n { $a = get_app(); + if (empty($s)) { + return ''; + } + if (x($a->strings, $s)) { $t = $a->strings[$s]; $s = is_array($t) ? $t[0] : $t; diff --git a/src/Core/System.php b/src/Core/System.php index abc39e5a2..84a64ab9a 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -152,12 +152,8 @@ EOT; if (isset($description["title"])) { $tpl = get_markup_template('http_status.tpl'); - echo replace_macros( - $tpl, - [ - '$title' => $description["title"], - '$description' => $description["description"]] - ); + echo replace_macros($tpl, ['$title' => $description["title"], + '$description' => defaults($description, 'description', '')]); } killme(); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index c413bef4f..488435331 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -662,6 +662,11 @@ class GContact $last_failure_str = ''; $last_contact_str = ''; + if (empty($contact["network"])) { + logger("Empty network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); + return false; + } + if (in_array($contact["network"], [NETWORK_PHANTOM])) { logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); return false; diff --git a/src/Model/Item.php b/src/Model/Item.php index 162387185..05254b8eb 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1030,10 +1030,8 @@ class Item extends BaseObject private static function guid($item, $notify) { - $guid = notags(trim($item['guid'])); - - if (!empty($guid)) { - return $guid; + if (!empty($item['guid'])) { + return notags(trim($item['guid'])); } if ($notify) { diff --git a/src/Object/Post.php b/src/Object/Post.php index 216008974..f9da142fe 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -356,8 +356,8 @@ class Post extends BaseObject 'guid' => urlencode($item['guid']), 'isevent' => $isevent, 'attend' => $attend, - 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, defaults($item, 'author-link', $item['url'])), - 'olinktitle' => L10n::t('View %s\'s profile @ %s', htmlentities($this->getOwnerName()), defaults($item, 'owner-link', $item['url'])), + 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']), + 'olinktitle' => L10n::t('View %s\'s profile @ %s', htmlentities($this->getOwnerName()), $item['owner-link']), 'to' => L10n::t('to'), 'via' => L10n::t('via'), 'wall' => L10n::t('Wall-to-Wall'), diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 72ab89d92..6525601fe 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -952,10 +952,10 @@ class DFRN if (isset($parent_item)) { $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]); if (DBM::is_result($conversation)) { - if ($r['conversation-uri'] != '') { + if ($conversation['conversation-uri'] != '') { $conversation_uri = $conversation['conversation-uri']; } - if ($r['conversation-href'] != '') { + if ($conversation['conversation-href'] != '') { $conversation_href = $conversation['conversation-href']; } } diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index d567be144..2ce54317e 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -1349,7 +1349,7 @@ class Diaspora $author = ""; // Fetch the author - for the old and the new Diaspora version - if ($source_xml->post->status_message->diaspora_handle) { + if ($source_xml->post->status_message && $source_xml->post->status_message->diaspora_handle) { $author = (string)$source_xml->post->status_message->diaspora_handle; } elseif ($source_xml->author && ($source_xml->getName() == "status_message")) { $author = (string)$source_xml->author; @@ -2165,7 +2165,7 @@ class Diaspora } // Send all existing comments and likes to the requesting server - $comments = Item::select(['id', 'verb', 'self'], ['parent' => $item['id']]); + $comments = Item::select(['id', 'parent', 'verb', 'self'], ['parent' => $item['id']]); while ($comment = Item::fetch($comments)) { if ($comment['id'] == $comment['parent']) { continue; diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 4ef80ddca..40218b0df 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1173,12 +1173,12 @@ class OStatus $guid = ""; preg_match("/guid='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $guid = $matches[1]; } preg_match('/guid="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") { + if (!empty($matches[1])) { $guid = $matches[1]; } diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 0c8ff27fa..4e76c68f7 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -61,7 +61,7 @@ class Delivery extends BaseObject $condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false]; $params = ['order' => ['id']]; - $itemdata = Item::select([], $condition, $params); + $itemdata = Item::select(Item::ITEM_FIELDLIST, $condition, $params); $items = []; while ($item = Item::fetch($itemdata)) { @@ -259,6 +259,10 @@ class Delivery extends BaseObject return; } + $user = dba::selectFirst('user', [], ['uid' => $target_uid]); + + $target_importer = array_merge($target_importer, $user); + // Set the user id. This is important if this is a public contact $target_importer['importer_uid'] = $target_uid; DFRN::import($atom, $target_importer); diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index cc08a7d71..b99433f81 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -29,10 +29,12 @@ function vier_init(App $a) $a->set_template_engine('smarty3'); - if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { - vier_community_info(); + if (!empty($a->argv[0]) && !empty($a->argv[1])) { + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { + vier_community_info(); - $a->page['htmlhead'] .= "\n"; + $a->page['htmlhead'] .= "\n"; + } } if ($a->is_mobile || $a->is_tablet) { @@ -104,7 +106,7 @@ EOT; // Hide the left menu bar /// @TODO maybe move this static array out where it should belong? - if (($a->page['aside'] == "") && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications", + if (empty($a->page['aside']) && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications", "probe", "webfinger", "login", "invite", "credits"])) { $a->page['htmlhead'] .= ""; }