mirror of
https://github.com/friendica/friendica
synced 2025-04-25 21:10:11 +00:00
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
|
|
@ -61,14 +61,16 @@ class OStatus
|
|||
|
||||
$aliaslink = $author["author-link"];
|
||||
|
||||
$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
|
||||
if (is_object($alternate)) {
|
||||
foreach ($alternate as $attributes) {
|
||||
$alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0);
|
||||
if (is_object($alternate_item)) {
|
||||
foreach ($alternate_item->attributes as $attributes) {
|
||||
if (($attributes->name == "href") && ($attributes->textContent != "")) {
|
||||
$author["author-link"] = $attributes->textContent;
|
||||
}
|
||||
}
|
||||
}
|
||||
$author["author-id"] = Contact::getIdForURL($author["author-link"]);
|
||||
|
||||
$author["contact-id"] = $contact["id"];
|
||||
|
||||
$contact = null;
|
||||
|
|
@ -131,9 +133,7 @@ class OStatus
|
|||
$author["author-name"] = $displayname;
|
||||
}
|
||||
|
||||
$author["owner-name"] = $author["author-name"];
|
||||
$author["owner-link"] = $author["author-link"];
|
||||
$author["owner-avatar"] = $author["author-avatar"];
|
||||
$author["owner-id"] = $author["author-id"];
|
||||
|
||||
// Only update the contacts if it is an OStatus contact
|
||||
if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
|
||||
|
|
@ -206,12 +206,16 @@ class OStatus
|
|||
dba::update('contact', $fields, ['id' => $cid], $old_contact);
|
||||
|
||||
// Update the avatar
|
||||
Contact::updateAvatar($author["author-avatar"], 0, $cid);
|
||||
if (!empty($author["author-avatar"])) {
|
||||
Contact::updateAvatar($author["author-avatar"], 0, $cid);
|
||||
}
|
||||
}
|
||||
|
||||
$contact["generation"] = 2;
|
||||
$contact["hide"] = false; // OStatus contacts are never hidden
|
||||
$contact["photo"] = $author["author-avatar"];
|
||||
if (!empty($author["author-avatar"])) {
|
||||
$contact["photo"] = $author["author-avatar"];
|
||||
}
|
||||
$gcid = GContact::update($contact);
|
||||
|
||||
GContact::link($gcid, $contact["uid"], $contact["id"]);
|
||||
|
|
@ -325,12 +329,15 @@ class OStatus
|
|||
$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
|
||||
|
||||
$hub = "";
|
||||
$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
|
||||
if (is_object($hub_attributes)) {
|
||||
foreach ($hub_attributes as $hub_attribute) {
|
||||
if ($hub_attribute->name == "href") {
|
||||
$hub = $hub_attribute->textContent;
|
||||
logger("Found hub ".$hub, LOGGER_DEBUG);
|
||||
$hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
|
||||
if (is_object($hub_items)) {
|
||||
$hub_attributes = $hub_items->attributes;
|
||||
if (is_object($hub_attributes)) {
|
||||
foreach ($hub_attributes as $hub_attribute) {
|
||||
if ($hub_attribute->name == "href") {
|
||||
$hub = $hub_attribute->textContent;
|
||||
logger("Found hub ".$hub, LOGGER_DEBUG);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -390,7 +397,7 @@ class OStatus
|
|||
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
|
||||
}
|
||||
|
||||
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context);
|
||||
$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
|
||||
if ($value != "") {
|
||||
$nickname = $value;
|
||||
} else {
|
||||
|
|
@ -441,6 +448,7 @@ class OStatus
|
|||
}
|
||||
|
||||
if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
|
||||
$dummy = null;
|
||||
Contact::removeFollower($importer, $contact, $item, $dummy);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -611,9 +619,12 @@ class OStatus
|
|||
foreach ($category->attributes as $attributes) {
|
||||
if ($attributes->name == "term") {
|
||||
$term = $attributes->textContent;
|
||||
if (strlen($item["tag"])) {
|
||||
if (!empty($item["tag"])) {
|
||||
$item["tag"] .= ',';
|
||||
} else {
|
||||
$item["tag"] = '';
|
||||
}
|
||||
|
||||
$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
|
||||
}
|
||||
}
|
||||
|
|
@ -1008,15 +1019,15 @@ class OStatus
|
|||
$link_data = self::processLinks($links, $item);
|
||||
}
|
||||
|
||||
$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
|
||||
$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
|
||||
$orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
|
||||
$orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects);
|
||||
$orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects);
|
||||
$orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects);
|
||||
|
||||
$orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
|
||||
|
||||
$item["author-name"] = $orig_author["author-name"];
|
||||
$item["author-link"] = $orig_author["author-link"];
|
||||
$item["author-avatar"] = $orig_author["author-avatar"];
|
||||
$item["author-id"] = $orig_author["author-id"];
|
||||
|
||||
$item["body"] = HTML::toBBCode($orig_body);
|
||||
$item["created"] = $orig_created;
|
||||
|
|
@ -1024,9 +1035,9 @@ class OStatus
|
|||
|
||||
$item["uri"] = $orig_uri;
|
||||
|
||||
$item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
|
||||
$item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
|
||||
|
||||
$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
|
||||
$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
|
||||
|
||||
$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
|
||||
if (is_object($inreplyto->item(0))) {
|
||||
|
|
@ -1055,7 +1066,7 @@ class OStatus
|
|||
foreach ($links as $link) {
|
||||
$attribute = self::readAttributes($link);
|
||||
|
||||
if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
|
||||
if (!empty($attribute['rel']) && !empty($attribute['href'])) {
|
||||
switch ($attribute['rel']) {
|
||||
case "alternate":
|
||||
$item["plink"] = $attribute['href'];
|
||||
|
|
@ -1077,13 +1088,15 @@ class OStatus
|
|||
if ($filetype == 'image') {
|
||||
$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
|
||||
} else {
|
||||
if (strlen($item["attach"])) {
|
||||
if (!empty($item["attach"])) {
|
||||
$item["attach"] .= ',';
|
||||
} else {
|
||||
$item["attach"] = '';
|
||||
}
|
||||
if (!isset($attribute['length'])) {
|
||||
$attribute['length'] = "0";
|
||||
}
|
||||
$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
|
||||
$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
|
||||
}
|
||||
break;
|
||||
case "related":
|
||||
|
|
@ -1097,7 +1110,7 @@ class OStatus
|
|||
}
|
||||
break;
|
||||
case "self":
|
||||
if ($item["plink"] == '') {
|
||||
if (empty($item["plink"])) {
|
||||
$item["plink"] = $attribute['href'];
|
||||
}
|
||||
$link_data['self'] = $attribute['href'];
|
||||
|
|
@ -1627,6 +1640,7 @@ class OStatus
|
|||
}
|
||||
|
||||
$contact = self::contactEntry($repeated_item['author-link'], $owner);
|
||||
$contact['account-type'] = $contact['contact-type'];
|
||||
|
||||
$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
|
||||
|
||||
|
|
@ -1972,10 +1986,10 @@ class OStatus
|
|||
if (isset($parent_item)) {
|
||||
$conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
|
||||
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'];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue