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

Merge pull request #6444 from MrPetovan/bug/5932-fix-email-notices 

Fix undefined offset notices in Protocol\Email
This commit is contained in:
Tobias Diekershoff 2019-01-14 06:31:13 +01:00 committed by GitHub
parent 2f427e9daa 795268eb7a
commit 2b198264c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Protocol/Email.php
View File

@ -514,7 +514,7 @@ class Email
preg_match($pattern, $message, $result);
if (($result[1] != '') && ($result[2] != '')) {
if (!empty($result[1]) && !empty($result[2])) {
$cleaned = trim($result[1])."\n";
$sig = trim($result[2]);
} else {
@ -545,7 +545,7 @@ class Email
}
$quotelevel = 0;
$nextline = trim($arrbody[$i+1]);
$nextline = trim(defaults($arrbody, $i + 1, ''));
while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>')
|| (substr($nextline, 0, 1) == ' '))) {
if (substr($nextline, 0, 1) == '>') {
@ -575,7 +575,7 @@ class Email
(substr(rtrim($line), -7) == '[/size]'));
}
if ($lines[$lineno] != '') {
if (!empty($lines[$lineno])) {
if (substr($lines[$lineno], -1) != ' ') {
$lines[$lineno] .= ' ';
}
@ -585,13 +585,15 @@ class Email
$line = ltrim(substr($line, 1));
}
} else {
$lines[$lineno] = '';
}
$lines[$lineno] .= $line;
if (((substr($line, -1, 1) != ' '))
|| ($quotelevel != $currquotelevel)) {
$lineno++;
}
}
}
return implode("\n", $lines);
}