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

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

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