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

Merge pull request #6752 from MrPetovan/bug/notices 

Fix various notices
This commit is contained in:
Michael Vogel 2019-02-24 21:30:07 +01:00 committed by GitHub
parent 69777c275b f95f6eced9
commit 4c6c5786ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Protocol/DFRN.php
View File

@ -769,31 +769,33 @@ class DFRN
*/ */
private static function addEntryAuthor(DOMDocument $doc, $element, $contact_url, $item) private static function addEntryAuthor(DOMDocument $doc, $element, $contact_url, $item)
{ {
$contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
$author = $doc->createElement($element); $author = $doc->createElement($element);
XML::addElement($doc, $author, "name", $contact["name"]);
XML::addElement($doc, $author, "uri", $contact["url"]);
XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
/// @Todo $contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
/// - Check real image type and image size if (!empty($contact)) {
/// - Check which of these boths elements we should use XML::addElement($doc, $author, "name", $contact["name"]);
$attributes = [ XML::addElement($doc, $author, "uri", $contact["url"]);
XML::addElement($doc, $author, "dfrn:handle", $contact["addr"]);
/// @Todo
/// - Check real image type and image size
/// - Check which of these boths elements we should use
$attributes = [
"rel" => "photo", "rel" => "photo",
"type" => "image/jpeg", "type" => "image/jpeg",
"media:width" => 80, "media:width" => 80,
"media:height" => 80, "media:height" => 80,
"href" => $contact["photo"]]; "href" => $contact["photo"]];
XML::addElement($doc, $author, "link", "", $attributes); XML::addElement($doc, $author, "link", "", $attributes);
$attributes = [ $attributes = [
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", "type" => "image/jpeg",
"media:width" => 80, "media:width" => 80,
"media:height" => 80, "media:height" => 80,
"href" => $contact["photo"]]; "href" => $contact["photo"]];
XML::addElement($doc, $author, "link", "", $attributes); XML::addElement($doc, $author, "link", "", $attributes);
}
return $author; return $author;
} }
@ -1603,6 +1605,7 @@ class DFRN
if (empty($author['avatar'])) { if (empty($author['avatar'])) {
Logger::log('Empty author: ' . $xml); Logger::log('Empty author: ' . $xml);
$author['avatar'] = '';
} }
if (DBA::isResult($contact_old) && !$onlyfetch) { if (DBA::isResult($contact_old) && !$onlyfetch) {

17
src/Protocol/OStatus.php
View File

@ -1763,20 +1763,17 @@ class OStatus
$verb = NAMESPACE_ACTIVITY_SCHEMA."favorite"; $verb = NAMESPACE_ACTIVITY_SCHEMA."favorite";
self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false); self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
$as_object = $doc->createElement("activity:object");
$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
if (DBA::isResult($parent)) {
$as_object = $doc->createElement("activity:object");
if (!$parent) { XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
$parent = [];
self::entryContent($doc, $as_object, $parent, $owner, "New entry");
$entry->appendChild($as_object);
} }
XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
self::entryContent($doc, $as_object, $parent, $owner, "New entry");
$entry->appendChild($as_object);
self::entryFooter($doc, $entry, $item, $owner); self::entryFooter($doc, $entry, $item, $owner);
return $entry; return $entry;

20
view/theme/frio/config.php
View File

@ -35,16 +35,16 @@ function theme_admin_post(App $a)
} }
if (isset($_POST['frio-settings-submit'])) { if (isset($_POST['frio-settings-submit'])) {
Config::set('frio', 'scheme', $_POST['frio_scheme']); Config::set('frio', 'scheme', defaults($_POST, 'frio_scheme', ''));
Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']); Config::set('frio', 'nav_bg', defaults($_POST, 'frio_nav_bg', ''));
Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']); Config::set('frio', 'nav_icon_color', defaults($_POST, 'frio_nav_icon_color', ''));
Config::set('frio', 'link_color', $_POST['frio_link_color']); Config::set('frio', 'link_color', defaults($_POST, 'frio_link_color', ''));
Config::set('frio', 'background_color', $_POST['frio_background_color']); Config::set('frio', 'background_color', defaults($_POST, 'frio_background_color', ''));
Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']); Config::set('frio', 'contentbg_transp', defaults($_POST, 'frio_contentbg_transp', ''));
Config::set('frio', 'background_image', $_POST['frio_background_image']); Config::set('frio', 'background_image', defaults($_POST, 'frio_background_image', ''));
Config::set('frio', 'bg_image_option', $_POST['frio_bg_image_option']); Config::set('frio', 'bg_image_option', defaults($_POST, 'frio_bg_image_option', ''));
Config::set('frio', 'login_bg_image', $_POST['frio_login_bg_image']); Config::set('frio', 'login_bg_image', defaults($_POST, 'frio_login_bg_image', ''));
Config::set('frio', 'login_bg_color', $_POST['frio_login_bg_color']); Config::set('frio', 'login_bg_color', defaults($_POST, 'frio_login_bg_color', ''));
Config::set('frio', 'css_modified', time()); Config::set('frio', 'css_modified', time());
} }
} }