Several more warnings ... (#5340)
* Some more warnings removed * Even more warnings ... * Will it ever end? ;-) * Avoid warning in dbstructure * Origin and OStatus ... * There are more warnings solved ... yeah! * And again ... * We are not done yet * And more ... * And some new places ... * And more in the feeds * Avoid some more * And some backend stuff * Notifications cleared * Some more stuff * and again ... * It's getting fewer ... * Some warnings had been hidden in the notifications * Fix the fix * And another missing one ... * We need the owner here, not the user * Forgotten user * And more ... * And some more warnings disappeared ... * Some more frontend warnings * Some backend warnings removed * Fixed sidebar for "vier" * And more ... * Some more ... * And something for "remote self" * Am I stuck in an endless loop? * Fix: Clear tag and file field on update * Preset page content
This commit is contained in:
Michael Vogel
Hypolite Petovan
parent
32ef5623ab
commit
0360f7197a
48 changed files with 415 additions and 267 deletions
|
|
@ -45,7 +45,7 @@ class Feed {
|
|||
} else {
|
||||
logger("Test Atom/RSS feed", LOGGER_DEBUG);
|
||||
}
|
||||
if ($xml == "") {
|
||||
if (empty($xml)) {
|
||||
logger('XML is empty.', LOGGER_DEBUG);
|
||||
return;
|
||||
}
|
||||
|
|
@ -74,18 +74,18 @@ class Feed {
|
|||
|
||||
// Is it RDF?
|
||||
if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
|
||||
$author["author-link"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:link/text()')->item(0)->nodeValue;
|
||||
$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:title/text()')->item(0)->nodeValue;
|
||||
$author["author-link"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
|
||||
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:description/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:description/text()');
|
||||
}
|
||||
$entries = $xpath->query('/rdf:RDF/rss:item');
|
||||
}
|
||||
|
||||
// Is it Atom?
|
||||
if ($xpath->query('/atom:feed')->length > 0) {
|
||||
$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
|
||||
$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
|
||||
if (is_object($alternate)) {
|
||||
foreach ($alternate AS $attribute) {
|
||||
if ($attribute->name == "href") {
|
||||
|
|
@ -94,11 +94,8 @@ class Feed {
|
|||
}
|
||||
}
|
||||
|
||||
if ($author["author-link"] == "") {
|
||||
$author["author-link"] = $author["author-id"];
|
||||
}
|
||||
if ($author["author-link"] == "") {
|
||||
$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
|
||||
if (empty($author["author-link"])) {
|
||||
$self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']");
|
||||
if (is_object($self)) {
|
||||
foreach ($self AS $attribute) {
|
||||
if ($attribute->name == "href") {
|
||||
|
|
@ -108,27 +105,27 @@ class Feed {
|
|||
}
|
||||
}
|
||||
|
||||
if ($author["author-link"] == "") {
|
||||
$author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-link"])) {
|
||||
$author["author-link"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
|
||||
}
|
||||
$author["author-avatar"] = $xpath->evaluate('/atom:feed/atom:logo/text()')->item(0)->nodeValue;
|
||||
$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
|
||||
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:title/text()')->item(0)->nodeValue;
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
|
||||
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:subtitle/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
|
||||
}
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/atom:feed/atom:author/atom:name/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
|
||||
}
|
||||
$value = $xpath->evaluate('atom:author/poco:displayName/text()')->item(0)->nodeValue;
|
||||
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
|
||||
if ($value != "") {
|
||||
$author["author-name"] = $value;
|
||||
}
|
||||
if ($simulate) {
|
||||
$author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
|
||||
$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:uri/text()');
|
||||
|
||||
$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
|
||||
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
|
||||
if ($value != "") {
|
||||
$author["author-nick"] = $value;
|
||||
}
|
||||
|
|
@ -140,7 +137,7 @@ class Feed {
|
|||
if ($value != "") {
|
||||
$author["author-about"] = $value;
|
||||
}
|
||||
$avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes;
|
||||
$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
|
||||
if (is_object($avatar)) {
|
||||
foreach ($avatar AS $attribute) {
|
||||
if ($attribute->name == "href") {
|
||||
|
|
@ -159,20 +156,20 @@ class Feed {
|
|||
|
||||
// Is it RSS?
|
||||
if ($xpath->query('/rss/channel')->length > 0) {
|
||||
$author["author-link"] = $xpath->evaluate('/rss/channel/link/text()')->item(0)->nodeValue;
|
||||
$author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
|
||||
|
||||
$author["author-name"] = $xpath->evaluate('/rss/channel/title/text()')->item(0)->nodeValue;
|
||||
$author["author-avatar"] = $xpath->evaluate('/rss/channel/image/url/text()')->item(0)->nodeValue;
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
|
||||
$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
|
||||
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rss/channel/copyright/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
|
||||
}
|
||||
if ($author["author-name"] == "") {
|
||||
$author["author-name"] = $xpath->evaluate('/rss/channel/description/text()')->item(0)->nodeValue;
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
|
||||
}
|
||||
$author["edited"] = $author["created"] = $xpath->query('/rss/channel/pubDate/text()')->item(0)->nodeValue;
|
||||
$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
|
||||
|
||||
$author["app"] = $xpath->evaluate('/rss/channel/generator/text()')->item(0)->nodeValue;
|
||||
$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
|
||||
|
||||
$entries = $xpath->query('/rss/channel/item');
|
||||
}
|
||||
|
|
@ -180,7 +177,7 @@ class Feed {
|
|||
if (!$simulate) {
|
||||
$author["author-link"] = $contact["url"];
|
||||
|
||||
if ($author["author-name"] == "") {
|
||||
if (empty($author["author-name"])) {
|
||||
$author["author-name"] = $contact["name"];
|
||||
}
|
||||
$author["author-avatar"] = $contact["thumb"];
|
||||
|
|
@ -215,9 +212,9 @@ class Feed {
|
|||
|
||||
$item = array_merge($header, $author);
|
||||
|
||||
$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
|
||||
$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']", $entry);
|
||||
if (!is_object($alternate)) {
|
||||
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
|
||||
$alternate = XML::getFirstAttributes($xpath, "atom:link", $entry);
|
||||
}
|
||||
if (is_object($alternate)) {
|
||||
foreach ($alternate AS $attribute) {
|
||||
|
|
@ -226,19 +223,19 @@ class Feed {
|
|||
}
|
||||
}
|
||||
}
|
||||
if ($item["plink"] == "") {
|
||||
if (empty($item["plink"])) {
|
||||
$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
|
||||
}
|
||||
if ($item["plink"] == "") {
|
||||
if (empty($item["plink"])) {
|
||||
$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
|
||||
}
|
||||
|
||||
$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
|
||||
|
||||
if ($item["uri"] == "") {
|
||||
if (empty($item["uri"])) {
|
||||
$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
|
||||
}
|
||||
if ($item["uri"] == "") {
|
||||
if (empty($item["uri"])) {
|
||||
$item["uri"] = $item["plink"];
|
||||
}
|
||||
|
||||
|
|
@ -260,23 +257,23 @@ class Feed {
|
|||
|
||||
$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
|
||||
|
||||
if ($item["title"] == "") {
|
||||
if (empty($item["title"])) {
|
||||
$item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
|
||||
}
|
||||
if ($item["title"] == "") {
|
||||
if (empty($item["title"])) {
|
||||
$item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
|
||||
}
|
||||
$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
|
||||
|
||||
if ($published == "") {
|
||||
if (empty($published)) {
|
||||
$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
|
||||
}
|
||||
if ($published == "") {
|
||||
if (empty($published)) {
|
||||
$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
|
||||
}
|
||||
$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
|
||||
|
||||
if ($updated == "") {
|
||||
if (empty($updated)) {
|
||||
$updated = $published;
|
||||
}
|
||||
if ($published != "") {
|
||||
|
|
@ -287,10 +284,10 @@ class Feed {
|
|||
}
|
||||
$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
|
||||
|
||||
if ($creator == "") {
|
||||
if (empty($creator)) {
|
||||
$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
|
||||
}
|
||||
if ($creator == "") {
|
||||
if (empty($creator)) {
|
||||
$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
|
||||
}
|
||||
if ($creator != "") {
|
||||
|
|
@ -324,8 +321,10 @@ class Feed {
|
|||
$type = $attribute->textContent;
|
||||
}
|
||||
}
|
||||
if (strlen($item["attach"])) {
|
||||
if (!empty($item["attach"])) {
|
||||
$item["attach"] .= ',';
|
||||
} else {
|
||||
$item["attach"] = '';
|
||||
}
|
||||
|
||||
$attachments[] = ["link" => $href, "type" => $type, "length" => $length];
|
||||
|
|
@ -345,16 +344,16 @@ class Feed {
|
|||
$tags .= $taglink;
|
||||
}
|
||||
|
||||
$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
|
||||
$body = trim(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
|
||||
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
|
||||
if (empty($body)) {
|
||||
$body = trim(XML::getFirstNodeValue($xpath, 'content:encoded/text()', $entry));
|
||||
}
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
|
||||
if (empty($body)) {
|
||||
$body = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
|
||||
}
|
||||
if ($body == "") {
|
||||
$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
|
||||
if (empty($body)) {
|
||||
$body = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
|
||||
}
|
||||
|
||||
// remove the content of the title if it is identically to the body
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue