mirror of
https://github.com/friendica/friendica
synced 2024-12-23 09:20:17 +00:00
Exceptions and warnings fixed
This commit is contained in:
parent
ac087749e3
commit
8cf82a8449
2 changed files with 7 additions and 2 deletions
|
@ -259,7 +259,7 @@ class Email
|
|||
|
||||
if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
|
||||
// filename may be given as 'Filename' or 'Name' or both
|
||||
$filename = ($params['filename'])? $params['filename'] : $params['name'];
|
||||
$filename = $params['filename'] ?? $params['name'];
|
||||
// filename may be encoded, so see imap_mime_header_decode()
|
||||
$attachments[$filename] = $data; // this is a problem if two files have same name
|
||||
}
|
||||
|
|
|
@ -235,7 +235,12 @@ class ParseUrl
|
|||
return $siteinfo;
|
||||
}
|
||||
|
||||
try {
|
||||
$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
|
||||
} catch (\Throwable $th) {
|
||||
Logger::info('Exception when fetching', ['url' => $url, 'code' => $th->getCode(), 'message' => $th->getMessage()]);
|
||||
return $siteinfo;
|
||||
}
|
||||
if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
|
||||
Logger::info('Empty body or error when fetching', ['url' => $url, 'success' => $curlResult->isSuccess(), 'code' => $curlResult->getReturnCode()]);
|
||||
return $siteinfo;
|
||||
|
|
Loading…
Reference in a new issue