]> git.mxchange.org Git - friendica.git/commitdiff
Avoid warnings/fatal errors
authorMichael <heluecht@pirati.ca>
Sun, 28 Aug 2022 04:00:18 +0000 (04:00 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 28 Aug 2022 04:00:18 +0000 (04:00 +0000)
src/Contact/Avatar.php
src/Util/ParseUrl.php

index 1dd2f9cee66c5c8203553771e99a4917eb310208..d03a5f4e64d9337b5eb6bb77ec1e881f21f7a32a 100644 (file)
@@ -161,7 +161,7 @@ class Avatar
                        $dirpath .= $part . '/';
 
                        if (!file_exists($dirpath)) {
                        $dirpath .= $part . '/';
 
                        if (!file_exists($dirpath)) {
-                               if (!mkdir($dirpath, $dir_perm)) {
+                               if (!@mkdir($dirpath, $dir_perm)) {
                                        Logger::warning('Directory could not be created', ['directory' => $dirpath]);
                                }
                        } elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) {
                                        Logger::warning('Directory could not be created', ['directory' => $dirpath]);
                                }
                        } elseif ((($old_perm = fileperms($dirpath) & 0777) != $dir_perm) && !chmod($dirpath, $dir_perm)) {
index a0ff0f1773a9d74f1799a688e53e09d33d3e611d..d0b168278563e24be39d6a79c01939846e7e1d98 100644 (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);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'image');
                        $jsonldinfo['text'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'image');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['image'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
                        $jsonldinfo['image'] = trim($content);
                }
 
                $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 = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
                $jsonldinfo = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_description'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                        $jsonldinfo['publisher_description'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_url'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'thumbnailUrl');
                        $jsonldinfo['publisher_url'] = trim($content);
                }
 
                $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 = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
                $jsonldinfo = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_description'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                        $jsonldinfo['publisher_description'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_url'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject');
                        $jsonldinfo['publisher_url'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'logo', 'url', '@type', 'ImageObject');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_img'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'brand', 'name', '@type', 'Organization');
                        $jsonldinfo['publisher_img'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'brand', 'name', '@type', 'Organization');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'brand', 'url', '@type', 'Organization');
                        $jsonldinfo['publisher_name'] = trim($content);
                }
 
                $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 = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
                $jsonldinfo = [];
 
                $content = JsonLD::fetchElement($jsonld, 'name');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $jsonldinfo['author_name'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
                        $jsonldinfo['author_name'] = trim($content);
                }
 
                $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 = [];
 
                $content = JsonLD::fetchElement($jsonld, 'caption');
                $media = [];
 
                $content = JsonLD::fetchElement($jsonld, 'caption');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['caption'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
                        $media['caption'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'url');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['url'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'mainEntityOfPage');
                        $media['url'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'mainEntityOfPage');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['main'] = Strings::compareLink($content, $siteinfo['url']);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'description');
                        $media['main'] = Strings::compareLink($content, $siteinfo['url']);
                }
 
                $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);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'embedUrl');
                        $media['content'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'embedUrl');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['embed'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'height');
                        $media['embed'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'height');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['height'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'width');
                        $media['height'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'width');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['width'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'image');
                        $media['width'] = trim($content);
                }
 
                $content = JsonLD::fetchElement($jsonld, 'image');
-               if (!empty($content)) {
+               if (!empty($content) && is_string($content)) {
                        $media['image'] = trim($content);
                }
 
                        $media['image'] = trim($content);
                }