keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid warnings/fatal errors

Browse source
This commit is contained in:
Michael 2022-08-28 04:00:18 +00:00
parent 2173fb38e0
commit d54cf9cc21
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Contact/Avatar.php
View file

@ -161,7 +161,7 @@ class Avatar
$dirpath .= $part . '/'; $dirpath .= $part . '/';
if (!file_exists($dirpath)) { if (!file_exists($dirpath)) {
if (!mkdir($dirpath, $dir_perm)) { if (!@mkdir($dirpath, $dir_perm)) {
Logger::warning('Directory could not be created', ['directory' => $dirpath]); Logger::warning('Directory could not be created', ['directory' => $dirpath]);
} }
} elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) { } elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) {

50
src/Util/ParseUrl.php
View file

@ -1040,17 +1040,17 @@ class ParseUrl
} }
$content = JsonLD::fetchElement($jsonld, 'description'); $content = JsonLD::fetchElement($jsonld, 'description');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['text'] = trim($content); $jsonldinfo['text'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'image'); $content = JsonLD::fetchElement($jsonld, 'image');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['image'] = trim($content); $jsonldinfo['image'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'thumbnailUrl'); $content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['image'] = trim($content); $jsonldinfo['image'] = trim($content);
} }
@ -1075,22 +1075,22 @@ class ParseUrl
$jsonldinfo = []; $jsonldinfo = [];
$content = JsonLD::fetchElement($jsonld, 'name'); $content = JsonLD::fetchElement($jsonld, 'name');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_name'] = trim($content); $jsonldinfo['publisher_name'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'description'); $content = JsonLD::fetchElement($jsonld, 'description');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_description'] = trim($content); $jsonldinfo['publisher_description'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'url'); $content = JsonLD::fetchElement($jsonld, 'url');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_url'] = trim($content); $jsonldinfo['publisher_url'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'thumbnailUrl'); $content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['image'] = trim($content); $jsonldinfo['image'] = trim($content);
} }
@ -1114,32 +1114,32 @@ class ParseUrl
$jsonldinfo = []; $jsonldinfo = [];
$content = JsonLD::fetchElement($jsonld, 'name'); $content = JsonLD::fetchElement($jsonld, 'name');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_name'] = trim($content); $jsonldinfo['publisher_name'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'description'); $content = JsonLD::fetchElement($jsonld, 'description');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_description'] = trim($content); $jsonldinfo['publisher_description'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'url'); $content = JsonLD::fetchElement($jsonld, 'url');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_url'] = trim($content); $jsonldinfo['publisher_url'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject'); $content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_img'] = trim($content); $jsonldinfo['publisher_img'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'brand', 'name', '@type', 'Organization'); $content = JsonLD::fetchElement($jsonld, 'brand', 'name', '@type', 'Organization');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_name'] = trim($content); $jsonldinfo['publisher_name'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'brand', 'url', '@type', 'Organization'); $content = JsonLD::fetchElement($jsonld, 'brand', 'url', '@type', 'Organization');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['publisher_url'] = trim($content); $jsonldinfo['publisher_url'] = trim($content);
} }
@ -1161,12 +1161,12 @@ class ParseUrl
$jsonldinfo = []; $jsonldinfo = [];
$content = JsonLD::fetchElement($jsonld, 'name'); $content = JsonLD::fetchElement($jsonld, 'name');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['author_name'] = trim($content); $jsonldinfo['author_name'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'description'); $content = JsonLD::fetchElement($jsonld, 'description');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['author_description'] = trim($content); $jsonldinfo['author_description'] = trim($content);
} }
@ -1176,7 +1176,7 @@ class ParseUrl
} }
$content = JsonLD::fetchElement($jsonld, 'url'); $content = JsonLD::fetchElement($jsonld, 'url');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$jsonldinfo['author_url'] = trim($content); $jsonldinfo['author_url'] = trim($content);
} }
@ -1207,22 +1207,22 @@ class ParseUrl
$media = []; $media = [];
$content = JsonLD::fetchElement($jsonld, 'caption'); $content = JsonLD::fetchElement($jsonld, 'caption');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['caption'] = trim($content); $media['caption'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'url'); $content = JsonLD::fetchElement($jsonld, 'url');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['url'] = trim($content); $media['url'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'mainEntityOfPage'); $content = JsonLD::fetchElement($jsonld, 'mainEntityOfPage');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['main'] = Strings::compareLink($content, $siteinfo['url']); $media['main'] = Strings::compareLink($content, $siteinfo['url']);
} }
$content = JsonLD::fetchElement($jsonld, 'description'); $content = JsonLD::fetchElement($jsonld, 'description');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['description'] = trim($content); $media['description'] = trim($content);
} }
@ -1232,27 +1232,27 @@ class ParseUrl
} }
$content = JsonLD::fetchElement($jsonld, 'contentUrl'); $content = JsonLD::fetchElement($jsonld, 'contentUrl');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['content'] = trim($content); $media['content'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'embedUrl'); $content = JsonLD::fetchElement($jsonld, 'embedUrl');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['embed'] = trim($content); $media['embed'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'height'); $content = JsonLD::fetchElement($jsonld, 'height');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['height'] = trim($content); $media['height'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'width'); $content = JsonLD::fetchElement($jsonld, 'width');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['width'] = trim($content); $media['width'] = trim($content);
} }
$content = JsonLD::fetchElement($jsonld, 'image'); $content = JsonLD::fetchElement($jsonld, 'image');
if (!empty($content)) { if (!empty($content) && is_string($content)) {
$media['image'] = trim($content); $media['image'] = trim($content);
} }