friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4576 from MrPetovan/bug/fix-attach-display 

Formatting changes to Protocol/Feed
This commit is contained in:
Michael Vogel 2018-03-11 00:43:16 +01:00 committed by GitHub
parent 2009c06195 9b14165cc8
commit 28615ae24b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Protocol/Feed.php
View File

@ -85,9 +85,9 @@ class Feed {
if ($xpath->query('/atom:feed')->length > 0) {
$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
if (is_object($alternate)) {
foreach ($alternate AS $attributes) {
if ($attributes->name == "href") {
$author["author-link"] = $attributes->textContent;
foreach ($alternate AS $attribute) {
if ($attribute->name == "href") {
$author["author-link"] = $attribute->textContent;
}
}
}
@ -98,9 +98,9 @@ class Feed {
if ($author["author-link"] == "") {
$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
if (is_object($self)) {
foreach ($self AS $attributes) {
if ($attributes->name == "href") {
$author["author-link"] = $attributes->textContent;
foreach ($self AS $attribute) {
if ($attribute->name == "href") {
$author["author-link"] = $attribute->textContent;
}
}
}
@ -140,9 +140,9 @@ class Feed {
}
$avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes;
if (is_object($avatar)) {
foreach ($avatar AS $attributes) {
if ($attributes->name == "href") {
$author["author-avatar"] = $attributes->textContent;
foreach ($avatar AS $attribute) {
if ($attribute->name == "href") {
$author["author-avatar"] = $attribute->textContent;
}
}
}
@ -218,9 +218,9 @@ class Feed {
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
}
if (is_object($alternate)) {
foreach ($alternate AS $attributes) {
if ($attributes->name == "href") {
$item["plink"] = $attributes->textContent;
foreach ($alternate AS $attribute) {
if ($attribute->name == "href") {
$item["plink"] = $attribute->textContent;
}
}
}
@ -313,13 +313,13 @@ class Feed {
$type = "";
$title = "";
foreach ($enclosure->attributes AS $attributes) {
if ($attributes->name == "url" || $attributes->name == "href") {
$href = $attributes->textContent;
} elseif ($attributes->name == "length") {
$length = $attributes->textContent;
} elseif ($attributes->name == "type") {
$type = $attributes->textContent;
foreach ($enclosure->attributes AS $attribute) {
if (in_array($attribute->name, ["url", "href"])) {
$href = $attribute->textContent;
} elseif ($attribute->name == "length") {
$length = $attribute->textContent;
} elseif ($attribute->name == "type") {
$type = $attribute->textContent;
}
}
if (strlen($item["attach"])) {