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

Don't echo & concat, use `,`

This commit is contained in:
Marcus Bointon 2017-07-28 10:54:10 +02:00
parent a4fdea1590
commit a8728150fd
No known key found for this signature in database
GPG Key ID: DE31CD6EB646AA24
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
get_oauth_token.php
View File

@ -140,5 +140,5 @@ if (!isset($_GET['code'])) {
);
// Use this to interact with an API on the users behalf
// Use this to get a new access token if the old one expires
echo 'Refresh Token: ' . $token->getRefreshToken();
echo 'Refresh Token: ', $token->getRefreshToken();
}

7
src/PHPMailer.php
View File

@ -779,18 +779,17 @@ class PHPMailer
preg_replace('/[\r\n]+/', '', $str),
ENT_QUOTES,
'UTF-8'
)
. "<br>\n";
), "<br>\n";
break;
case 'echo':
default:
//Normalize line breaks
$str = preg_replace('/\r\n?/ms', "\n", $str);
echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
echo gmdate('Y-m-d H:i:s'), "\t", str_replace(
"\n",
"\n \t ",
trim($str)
) . "\n";
), "\n";
}
}

4
src/POP3.php
View File

@ -327,7 +327,7 @@ class POP3
{
$response = fgets($this->pop_conn, $size);
if ($this->do_debug >= 1) {
echo "Server -> Client: $response";
echo 'Server -> Client: ', $response;
}
return $response;
}
@ -343,7 +343,7 @@ class POP3
{
if ($this->pop_conn) {
if ($this->do_debug >= 2) { //Show client messages when debug >= 2
echo "Client -> Server: $string";
echo 'Client -> Server: ', $string;
}
return fwrite($this->pop_conn, $string, strlen($string));
}

8
src/SMTP.php
View File

@ -231,21 +231,21 @@ class SMTP
break;
case 'html':
//Cleans up output a bit for a better looking, HTML-safe output
echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
echo gmdate('Y-m-d H:i:s'), ' ', htmlentities(
preg_replace('/[\r\n]+/', '', $str),
ENT_QUOTES,
'UTF-8'
) . "<br>\n";
), "<br>\n";
break;
case 'echo':
default:
//Normalize line breaks
$str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
echo gmdate('Y-m-d H:i:s'), "\t", str_replace(
"\n",
"\n \t ",
trim($str)
) . "\n";
), "\n";
}
}